Chris@439
|
1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
Chris@439
|
2
|
Chris@439
|
3 /*
|
Chris@439
|
4 Sonic Visualiser
|
Chris@439
|
5 An audio file viewer and annotation editor.
|
Chris@439
|
6 Centre for Digital Music, Queen Mary, University of London.
|
Chris@727
|
7 This file copyright 2008-2012 QMUL.
|
Chris@439
|
8
|
Chris@439
|
9 This program is free software; you can redistribute it and/or
|
Chris@439
|
10 modify it under the terms of the GNU General Public License as
|
Chris@439
|
11 published by the Free Software Foundation; either version 2 of the
|
Chris@439
|
12 License, or (at your option) any later version. See the file
|
Chris@439
|
13 COPYING included with this distribution for more information.
|
Chris@439
|
14 */
|
Chris@439
|
15
|
Chris@439
|
16 #include "RDFImporter.h"
|
Chris@439
|
17
|
Chris@439
|
18 #include <map>
|
Chris@439
|
19 #include <vector>
|
Chris@439
|
20
|
Chris@439
|
21 #include <iostream>
|
Chris@439
|
22 #include <cmath>
|
Chris@439
|
23
|
Chris@439
|
24 #include "base/ProgressReporter.h"
|
Chris@439
|
25 #include "base/RealTime.h"
|
Chris@439
|
26
|
Chris@439
|
27 #include "data/model/SparseOneDimensionalModel.h"
|
Chris@439
|
28 #include "data/model/SparseTimeValueModel.h"
|
Chris@439
|
29 #include "data/model/EditableDenseThreeDimensionalModel.h"
|
Chris@449
|
30 #include "data/model/NoteModel.h"
|
Chris@510
|
31 #include "data/model/TextModel.h"
|
Chris@449
|
32 #include "data/model/RegionModel.h"
|
Chris@499
|
33 #include "data/model/WaveFileModel.h"
|
Chris@499
|
34
|
Chris@499
|
35 #include "data/fileio/FileSource.h"
|
Chris@520
|
36 #include "data/fileio/CachedFile.h"
|
Chris@581
|
37 #include "data/fileio/FileFinder.h"
|
Chris@522
|
38
|
Chris@726
|
39 #include <dataquay/BasicStore.h>
|
Chris@726
|
40 #include <dataquay/PropertyObject.h>
|
Chris@726
|
41
|
Chris@726
|
42 using Dataquay::Uri;
|
Chris@726
|
43 using Dataquay::Node;
|
Chris@726
|
44 using Dataquay::Nodes;
|
Chris@726
|
45 using Dataquay::Triple;
|
Chris@726
|
46 using Dataquay::Triples;
|
Chris@726
|
47 using Dataquay::BasicStore;
|
Chris@726
|
48 using Dataquay::PropertyObject;
|
Chris@726
|
49
|
Chris@439
|
50 using std::cerr;
|
Chris@439
|
51 using std::endl;
|
Chris@439
|
52
|
Chris@439
|
53 class RDFImporterImpl
|
Chris@439
|
54 {
|
Chris@439
|
55 public:
|
Chris@439
|
56 RDFImporterImpl(QString url, int sampleRate);
|
Chris@439
|
57 virtual ~RDFImporterImpl();
|
Chris@490
|
58
|
Chris@490
|
59 void setSampleRate(int sampleRate) { m_sampleRate = sampleRate; }
|
Chris@439
|
60
|
Chris@439
|
61 bool isOK();
|
Chris@439
|
62 QString getErrorString() const;
|
Chris@439
|
63
|
Chris@439
|
64 std::vector<Model *> getDataModels(ProgressReporter *);
|
Chris@439
|
65
|
Chris@439
|
66 protected:
|
Chris@726
|
67 BasicStore *m_store;
|
Chris@726
|
68
|
Chris@439
|
69 QString m_uristring;
|
Chris@439
|
70 QString m_errorString;
|
Chris@499
|
71 std::map<QString, Model *> m_audioModelMap;
|
Chris@439
|
72 int m_sampleRate;
|
Chris@439
|
73
|
Chris@617
|
74 std::map<Model *, std::map<QString, float> > m_labelValueMap;
|
Chris@617
|
75
|
Chris@499
|
76 void getDataModelsAudio(std::vector<Model *> &, ProgressReporter *);
|
Chris@440
|
77 void getDataModelsSparse(std::vector<Model *> &, ProgressReporter *);
|
Chris@440
|
78 void getDataModelsDense(std::vector<Model *> &, ProgressReporter *);
|
Chris@440
|
79
|
Chris@493
|
80 void getDenseModelTitle(Model *, QString, QString);
|
Chris@493
|
81
|
Chris@440
|
82 void getDenseFeatureProperties(QString featureUri,
|
Chris@440
|
83 int &sampleRate, int &windowLength,
|
Chris@440
|
84 int &hopSize, int &width, int &height);
|
Chris@440
|
85
|
Chris@449
|
86 void fillModel(Model *, long, long, bool, std::vector<float> &, QString);
|
Chris@439
|
87 };
|
Chris@439
|
88
|
Chris@439
|
89 QString
|
Chris@439
|
90 RDFImporter::getKnownExtensions()
|
Chris@439
|
91 {
|
Chris@439
|
92 return "*.rdf *.n3 *.ttl";
|
Chris@439
|
93 }
|
Chris@439
|
94
|
Chris@439
|
95 RDFImporter::RDFImporter(QString url, int sampleRate) :
|
Chris@439
|
96 m_d(new RDFImporterImpl(url, sampleRate))
|
Chris@439
|
97 {
|
Chris@439
|
98 }
|
Chris@439
|
99
|
Chris@439
|
100 RDFImporter::~RDFImporter()
|
Chris@439
|
101 {
|
Chris@439
|
102 delete m_d;
|
Chris@439
|
103 }
|
Chris@439
|
104
|
Chris@490
|
105 void
|
Chris@490
|
106 RDFImporter::setSampleRate(int sampleRate)
|
Chris@490
|
107 {
|
Chris@490
|
108 m_d->setSampleRate(sampleRate);
|
Chris@490
|
109 }
|
Chris@490
|
110
|
Chris@439
|
111 bool
|
Chris@439
|
112 RDFImporter::isOK()
|
Chris@439
|
113 {
|
Chris@439
|
114 return m_d->isOK();
|
Chris@439
|
115 }
|
Chris@439
|
116
|
Chris@439
|
117 QString
|
Chris@439
|
118 RDFImporter::getErrorString() const
|
Chris@439
|
119 {
|
Chris@439
|
120 return m_d->getErrorString();
|
Chris@439
|
121 }
|
Chris@439
|
122
|
Chris@439
|
123 std::vector<Model *>
|
Chris@439
|
124 RDFImporter::getDataModels(ProgressReporter *r)
|
Chris@439
|
125 {
|
Chris@439
|
126 return m_d->getDataModels(r);
|
Chris@439
|
127 }
|
Chris@439
|
128
|
Chris@439
|
129 RDFImporterImpl::RDFImporterImpl(QString uri, int sampleRate) :
|
Chris@726
|
130 m_store(new BasicStore),
|
Chris@439
|
131 m_uristring(uri),
|
Chris@439
|
132 m_sampleRate(sampleRate)
|
Chris@439
|
133 {
|
Chris@726
|
134 //!!! retrieve data if remote... then
|
Chris@726
|
135
|
Chris@726
|
136 m_store->addPrefix("mo", Uri("http://purl.org/ontology/mo/"));
|
Chris@726
|
137 m_store->addPrefix("af", Uri("http://purl.org/ontology/af/"));
|
Chris@726
|
138 m_store->addPrefix("dc", Uri("http://purl.org/dc/elements/1.1/"));
|
Chris@726
|
139 m_store->addPrefix("tl", Uri("http://purl.org/NET/c4dm/timeline.owl#"));
|
Chris@726
|
140 m_store->addPrefix("event", Uri("http://purl.org/NET/c4dm/event.owl#"));
|
Chris@726
|
141 m_store->addPrefix("rdfs", Uri("http://www.w3.org/2000/01/rdf-schema#"));
|
Chris@727
|
142
|
Chris@727
|
143 //!!! may throw!
|
Chris@726
|
144 m_store->import(QUrl::fromLocalFile(uri), BasicStore::ImportIgnoreDuplicates);
|
Chris@439
|
145 }
|
Chris@439
|
146
|
Chris@439
|
147 RDFImporterImpl::~RDFImporterImpl()
|
Chris@439
|
148 {
|
Chris@726
|
149 delete m_store;
|
Chris@439
|
150 }
|
Chris@439
|
151
|
Chris@439
|
152 bool
|
Chris@439
|
153 RDFImporterImpl::isOK()
|
Chris@439
|
154 {
|
Chris@439
|
155 return (m_errorString == "");
|
Chris@439
|
156 }
|
Chris@439
|
157
|
Chris@439
|
158 QString
|
Chris@439
|
159 RDFImporterImpl::getErrorString() const
|
Chris@439
|
160 {
|
Chris@439
|
161 return m_errorString;
|
Chris@439
|
162 }
|
Chris@439
|
163
|
Chris@439
|
164 std::vector<Model *>
|
Chris@439
|
165 RDFImporterImpl::getDataModels(ProgressReporter *reporter)
|
Chris@439
|
166 {
|
Chris@439
|
167 std::vector<Model *> models;
|
Chris@439
|
168
|
Chris@499
|
169 getDataModelsAudio(models, reporter);
|
Chris@499
|
170
|
Chris@490
|
171 if (m_sampleRate == 0) {
|
Chris@616
|
172 m_errorString = QString("Invalid audio data model (is audio file format supported?)");
|
Chris@686
|
173 std::cerr << m_errorString << std::endl;
|
Chris@490
|
174 return models;
|
Chris@490
|
175 }
|
Chris@490
|
176
|
Chris@508
|
177 QString error;
|
Chris@508
|
178
|
Chris@522
|
179 if (m_errorString != "") {
|
Chris@522
|
180 error = m_errorString;
|
Chris@522
|
181 }
|
Chris@508
|
182 m_errorString = "";
|
Chris@508
|
183
|
Chris@440
|
184 getDataModelsDense(models, reporter);
|
Chris@440
|
185
|
Chris@522
|
186 if (m_errorString != "") {
|
Chris@522
|
187 error = m_errorString;
|
Chris@522
|
188 }
|
Chris@440
|
189 m_errorString = "";
|
Chris@440
|
190
|
Chris@440
|
191 getDataModelsSparse(models, reporter);
|
Chris@440
|
192
|
Chris@522
|
193 if (m_errorString == "" && error != "") {
|
Chris@522
|
194 m_errorString = error;
|
Chris@522
|
195 }
|
Chris@440
|
196
|
Chris@440
|
197 return models;
|
Chris@440
|
198 }
|
Chris@440
|
199
|
Chris@440
|
200 void
|
Chris@499
|
201 RDFImporterImpl::getDataModelsAudio(std::vector<Model *> &models,
|
Chris@499
|
202 ProgressReporter *reporter)
|
Chris@499
|
203 {
|
Chris@726
|
204 Nodes sigs = m_store->match
|
Chris@726
|
205 (Triple(Node(), "a", m_store->expand("mo:Signal"))).a();
|
Chris@499
|
206
|
Chris@726
|
207 foreach (Node sig, sigs) {
|
Chris@726
|
208
|
Chris@726
|
209 Node file = m_store->matchFirst(Triple(Node(), "mo:encodes", sig)).a;
|
Chris@726
|
210 if (file == Node()) {
|
Chris@726
|
211 file = m_store->matchFirst(Triple(sig, "mo:available_as", Node())).c;
|
Chris@726
|
212 }
|
Chris@726
|
213 if (file == Node()) {
|
Chris@726
|
214 std::cerr << "RDFImporterImpl::getDataModelsAudio: ERROR: No source for signal " << sig << std::endl;
|
Chris@726
|
215 continue;
|
Chris@726
|
216 }
|
Chris@499
|
217
|
Chris@726
|
218 QString signal = sig.value;
|
Chris@726
|
219 QString source = file.value;
|
Chris@589
|
220
|
Chris@726
|
221 SVDEBUG << "NOTE: Seeking signal source \"" << source
|
Chris@726
|
222 << "\"..." << endl;
|
Chris@616
|
223
|
Chris@522
|
224 FileSource *fs = new FileSource(source, reporter);
|
Chris@616
|
225 if (fs->isAvailable()) {
|
Chris@690
|
226 SVDEBUG << "NOTE: Source is available: Local filename is \""
|
Chris@726
|
227 << fs->getLocalFilename()
|
Chris@726
|
228 << "\"..." << endl;
|
Chris@616
|
229 }
|
Chris@616
|
230
|
Chris@522
|
231 #ifdef NO_SV_GUI
|
Chris@522
|
232 if (!fs->isAvailable()) {
|
Chris@522
|
233 m_errorString = QString("Signal source \"%1\" is not available").arg(source);
|
Chris@522
|
234 delete fs;
|
Chris@522
|
235 continue;
|
Chris@522
|
236 }
|
Chris@522
|
237 #else
|
Chris@522
|
238 if (!fs->isAvailable()) {
|
Chris@726
|
239 SVDEBUG << "NOTE: Signal source \"" << source
|
Chris@726
|
240 << "\" is not available, using file finder..." << endl;
|
Chris@522
|
241 FileFinder *ff = FileFinder::getInstance();
|
Chris@581
|
242 if (ff) {
|
Chris@581
|
243 QString path = ff->find(FileFinder::AudioFile,
|
Chris@581
|
244 fs->getLocation(),
|
Chris@581
|
245 m_uristring);
|
Chris@581
|
246 if (path != "") {
|
Chris@617
|
247 std::cerr << "File finder returns: \"" << path.toStdString()
|
Chris@617
|
248 << "\"" << std::endl;
|
Chris@522
|
249 delete fs;
|
Chris@581
|
250 fs = new FileSource(path, reporter);
|
Chris@581
|
251 if (!fs->isAvailable()) {
|
Chris@581
|
252 delete fs;
|
Chris@581
|
253 m_errorString = QString("Signal source \"%1\" is not available").arg(source);
|
Chris@581
|
254 continue;
|
Chris@581
|
255 }
|
Chris@522
|
256 }
|
Chris@499
|
257 }
|
Chris@522
|
258 }
|
Chris@522
|
259 #endif
|
Chris@522
|
260
|
Chris@522
|
261 if (reporter) {
|
Chris@522
|
262 reporter->setMessage(RDFImporter::tr("Importing audio referenced in RDF..."));
|
Chris@522
|
263 }
|
Chris@522
|
264 fs->waitForData();
|
Chris@522
|
265 WaveFileModel *newModel = new WaveFileModel(*fs, m_sampleRate);
|
Chris@522
|
266 if (newModel->isOK()) {
|
Chris@686
|
267 std::cerr << "Successfully created wave file model from source at \"" << source << "\"" << std::endl;
|
Chris@522
|
268 models.push_back(newModel);
|
Chris@522
|
269 m_audioModelMap[signal] = newModel;
|
Chris@522
|
270 if (m_sampleRate == 0) {
|
Chris@522
|
271 m_sampleRate = newModel->getSampleRate();
|
Chris@499
|
272 }
|
Chris@508
|
273 } else {
|
Chris@522
|
274 m_errorString = QString("Failed to create wave file model from source at \"%1\"").arg(source);
|
Chris@522
|
275 delete newModel;
|
Chris@499
|
276 }
|
Chris@522
|
277 delete fs;
|
Chris@499
|
278 }
|
Chris@499
|
279 }
|
Chris@499
|
280
|
Chris@499
|
281 void
|
Chris@440
|
282 RDFImporterImpl::getDataModelsDense(std::vector<Model *> &models,
|
Chris@440
|
283 ProgressReporter *reporter)
|
Chris@440
|
284 {
|
Chris@499
|
285 if (reporter) {
|
Chris@499
|
286 reporter->setMessage(RDFImporter::tr("Importing dense signal data from RDF..."));
|
Chris@499
|
287 }
|
Chris@499
|
288
|
Chris@726
|
289 Nodes sigFeatures = m_store->match
|
Chris@726
|
290 (Triple(Node(), "af:signal_feature", Node())).c();
|
Chris@440
|
291
|
Chris@726
|
292 foreach (Node sf, sigFeatures) {
|
Chris@440
|
293
|
Chris@726
|
294 if (sf.type != Node::URI && sf.type != Node::Blank) continue;
|
Chris@726
|
295
|
Chris@726
|
296 Node t = m_store->matchFirst(Triple(sf, "a", Node())).c;
|
Chris@726
|
297 Node v = m_store->matchFirst(Triple(sf, "af:value", Node())).c;
|
Chris@440
|
298
|
Chris@726
|
299 QString feature = sf.value;
|
Chris@726
|
300 QString type = t.value;
|
Chris@726
|
301 QString value = v.value;
|
Chris@726
|
302
|
Chris@726
|
303 if (type == "" || value == "") continue;
|
Chris@440
|
304
|
Chris@440
|
305 int sampleRate = 0;
|
Chris@440
|
306 int windowLength = 0;
|
Chris@440
|
307 int hopSize = 0;
|
Chris@440
|
308 int width = 0;
|
Chris@440
|
309 int height = 0;
|
Chris@440
|
310 getDenseFeatureProperties
|
Chris@440
|
311 (feature, sampleRate, windowLength, hopSize, width, height);
|
Chris@440
|
312
|
Chris@440
|
313 if (sampleRate != 0 && sampleRate != m_sampleRate) {
|
Chris@440
|
314 cerr << "WARNING: Sample rate in dense feature description does not match our underlying rate -- using rate from feature description" << endl;
|
Chris@440
|
315 }
|
Chris@440
|
316 if (sampleRate == 0) sampleRate = m_sampleRate;
|
Chris@440
|
317
|
Chris@440
|
318 if (hopSize == 0) {
|
Chris@440
|
319 cerr << "WARNING: Dense feature description does not specify a hop size -- assuming 1" << endl;
|
Chris@440
|
320 hopSize = 1;
|
Chris@440
|
321 }
|
Chris@440
|
322
|
Chris@440
|
323 if (height == 0) {
|
Chris@440
|
324 cerr << "WARNING: Dense feature description does not specify feature signal dimensions -- assuming one-dimensional (height = 1)" << endl;
|
Chris@440
|
325 height = 1;
|
Chris@440
|
326 }
|
Chris@440
|
327
|
Chris@440
|
328 QStringList values = value.split(' ', QString::SkipEmptyParts);
|
Chris@440
|
329
|
Chris@440
|
330 if (values.empty()) {
|
Chris@440
|
331 cerr << "WARNING: Dense feature description does not specify any values!" << endl;
|
Chris@440
|
332 continue;
|
Chris@440
|
333 }
|
Chris@440
|
334
|
Chris@440
|
335 if (height == 1) {
|
Chris@440
|
336
|
Chris@440
|
337 SparseTimeValueModel *m = new SparseTimeValueModel
|
Chris@440
|
338 (sampleRate, hopSize, false);
|
Chris@440
|
339
|
Chris@440
|
340 for (int j = 0; j < values.size(); ++j) {
|
Chris@440
|
341 float f = values[j].toFloat();
|
Chris@440
|
342 SparseTimeValueModel::Point point(j * hopSize, f, "");
|
Chris@440
|
343 m->addPoint(point);
|
Chris@440
|
344 }
|
Chris@493
|
345
|
Chris@493
|
346 getDenseModelTitle(m, feature, type);
|
Chris@440
|
347
|
Chris@558
|
348 m->setRDFTypeURI(type);
|
Chris@558
|
349
|
Chris@440
|
350 models.push_back(m);
|
Chris@440
|
351
|
Chris@440
|
352 } else {
|
Chris@440
|
353
|
Chris@440
|
354 EditableDenseThreeDimensionalModel *m =
|
Chris@535
|
355 new EditableDenseThreeDimensionalModel
|
Chris@535
|
356 (sampleRate, hopSize, height,
|
Chris@535
|
357 EditableDenseThreeDimensionalModel::NoCompression, false);
|
Chris@440
|
358
|
Chris@440
|
359 EditableDenseThreeDimensionalModel::Column column;
|
Chris@440
|
360
|
Chris@440
|
361 int x = 0;
|
Chris@440
|
362
|
Chris@440
|
363 for (int j = 0; j < values.size(); ++j) {
|
Chris@440
|
364 if (j % height == 0 && !column.empty()) {
|
Chris@440
|
365 m->setColumn(x++, column);
|
Chris@440
|
366 column.clear();
|
Chris@440
|
367 }
|
Chris@440
|
368 column.push_back(values[j].toFloat());
|
Chris@440
|
369 }
|
Chris@440
|
370
|
Chris@440
|
371 if (!column.empty()) {
|
Chris@440
|
372 m->setColumn(x++, column);
|
Chris@440
|
373 }
|
Chris@440
|
374
|
Chris@493
|
375 getDenseModelTitle(m, feature, type);
|
Chris@493
|
376
|
Chris@558
|
377 m->setRDFTypeURI(type);
|
Chris@558
|
378
|
Chris@440
|
379 models.push_back(m);
|
Chris@440
|
380 }
|
Chris@440
|
381 }
|
Chris@440
|
382 }
|
Chris@440
|
383
|
Chris@440
|
384 void
|
Chris@493
|
385 RDFImporterImpl::getDenseModelTitle(Model *m,
|
Chris@493
|
386 QString featureUri,
|
Chris@493
|
387 QString featureTypeUri)
|
Chris@493
|
388 {
|
Chris@726
|
389 Node n = m_store->matchFirst
|
Chris@726
|
390 (Triple(Uri(featureUri), "dc:title", Node())).c;
|
Chris@493
|
391
|
Chris@726
|
392 if (n.type == Node::Literal && n.value != "") {
|
Chris@726
|
393 SVDEBUG << "RDFImporterImpl::getDenseModelTitle: Title (from signal) \"" << n.value << "\"" << endl;
|
Chris@726
|
394 m->setObjectName(n.value);
|
Chris@493
|
395 return;
|
Chris@493
|
396 }
|
Chris@493
|
397
|
Chris@726
|
398 n = m_store->matchFirst
|
Chris@726
|
399 (Triple(Uri(featureTypeUri), "dc:title", Node())).c;
|
Chris@726
|
400
|
Chris@726
|
401 if (n.type == Node::Literal && n.value != "") {
|
Chris@726
|
402 SVDEBUG << "RDFImporterImpl::getDenseModelTitle: Title (from signal type) \"" << n.value << "\"" << endl;
|
Chris@726
|
403 m->setObjectName(n.value);
|
Chris@493
|
404 return;
|
Chris@493
|
405 }
|
Chris@493
|
406
|
Chris@690
|
407 SVDEBUG << "RDFImporterImpl::getDenseModelTitle: No title available for feature <" << featureUri << ">" << endl;
|
Chris@493
|
408 }
|
Chris@493
|
409
|
Chris@493
|
410 void
|
Chris@440
|
411 RDFImporterImpl::getDenseFeatureProperties(QString featureUri,
|
Chris@440
|
412 int &sampleRate, int &windowLength,
|
Chris@440
|
413 int &hopSize, int &width, int &height)
|
Chris@440
|
414 {
|
Chris@726
|
415 Node dim = m_store->matchFirst
|
Chris@726
|
416 (Triple(Uri(featureUri), "af:dimensions", Node())).c;
|
Chris@489
|
417
|
Chris@726
|
418 cerr << "Dimensions = \"" << dim.value << "\"" << endl;
|
Chris@440
|
419
|
Chris@726
|
420 if (dim.type == Node::Literal && dim.value != "") {
|
Chris@726
|
421 QStringList dl = dim.value.split(" ");
|
Chris@726
|
422 if (dl.empty()) dl.push_back(dim.value);
|
Chris@440
|
423 if (dl.size() > 0) height = dl[0].toInt();
|
Chris@440
|
424 if (dl.size() > 1) width = dl[1].toInt();
|
Chris@440
|
425 }
|
Chris@726
|
426
|
Chris@726
|
427 // Looking for rate, hop, window from:
|
Chris@726
|
428 //
|
Chris@726
|
429 // ?feature mo:time ?time .
|
Chris@726
|
430 // ?time a tl:Interval .
|
Chris@726
|
431 // ?time tl:onTimeLine ?timeline .
|
Chris@726
|
432 // ?map tl:rangeTimeLine ?timeline .
|
Chris@726
|
433 // ?map tl:sampleRate ?rate .
|
Chris@726
|
434 // ?map tl:hopSize ?hop .
|
Chris@726
|
435 // ?map tl:windowLength ?window .
|
Chris@440
|
436
|
Chris@726
|
437 Node interval = m_store->matchFirst(Triple(Uri(featureUri), "mo:time", Node())).c;
|
Chris@440
|
438
|
Chris@726
|
439 if (!m_store->contains(Triple(interval, "a", m_store->expand("tl:Interval")))) {
|
Chris@726
|
440 cerr << "RDFImporterImpl::getDenseFeatureProperties: Feature time node "
|
Chris@726
|
441 << interval << " is not a tl:Interval" << endl;
|
Chris@726
|
442 return;
|
Chris@440
|
443 }
|
Chris@440
|
444
|
Chris@726
|
445 Node tl = m_store->matchFirst(Triple(interval, "tl:onTimeLine", Node())).c;
|
Chris@726
|
446
|
Chris@726
|
447 if (tl == Node()) {
|
Chris@726
|
448 cerr << "RDFImporterImpl::getDenseFeatureProperties: Interval node "
|
Chris@726
|
449 << interval << " lacks tl:onTimeLine property" << endl;
|
Chris@726
|
450 return;
|
Chris@440
|
451 }
|
Chris@440
|
452
|
Chris@726
|
453 Node map = m_store->matchFirst(Triple(Node(), "tl:rangeTimeLine", tl)).a;
|
Chris@726
|
454
|
Chris@726
|
455 if (map == Node()) {
|
Chris@726
|
456 cerr << "RDFImporterImpl::getDenseFeatureProperties: No map for "
|
Chris@726
|
457 << "timeline node " << tl << endl;
|
Chris@726
|
458 }
|
Chris@726
|
459
|
Chris@726
|
460 PropertyObject po(m_store, "tl:", map);
|
Chris@726
|
461
|
Chris@726
|
462 if (po.hasProperty("sampleRate")) {
|
Chris@726
|
463 sampleRate = po.getProperty("sampleRate").toInt();
|
Chris@726
|
464 }
|
Chris@726
|
465 if (po.hasProperty("hopSize")) {
|
Chris@726
|
466 hopSize = po.getProperty("hopSize").toInt();
|
Chris@726
|
467 }
|
Chris@726
|
468 if (po.hasProperty("windowLength")) {
|
Chris@726
|
469 windowLength = po.getProperty("windowLength").toInt();
|
Chris@440
|
470 }
|
Chris@440
|
471
|
Chris@440
|
472 cerr << "sr = " << sampleRate << ", hop = " << hopSize << ", win = " << windowLength << endl;
|
Chris@440
|
473 }
|
Chris@440
|
474
|
Chris@440
|
475 void
|
Chris@440
|
476 RDFImporterImpl::getDataModelsSparse(std::vector<Model *> &models,
|
Chris@440
|
477 ProgressReporter *reporter)
|
Chris@440
|
478 {
|
Chris@499
|
479 if (reporter) {
|
Chris@499
|
480 reporter->setMessage(RDFImporter::tr("Importing event data from RDF..."));
|
Chris@499
|
481 }
|
Chris@499
|
482
|
Chris@726
|
483 /*
|
Chris@726
|
484 This function is only used for sparse data (for dense data we
|
Chris@726
|
485 would be in getDataModelsDense instead).
|
Chris@489
|
486
|
Chris@726
|
487 Our query is intended to retrieve every thing that has a time,
|
Chris@726
|
488 and every feature type and value associated with a thing that
|
Chris@726
|
489 has a time.
|
Chris@439
|
490
|
Chris@726
|
491 We will then need to refine this big bag of results into a set
|
Chris@726
|
492 of data models.
|
Chris@439
|
493
|
Chris@726
|
494 Results that have different source signals should go into
|
Chris@726
|
495 different models.
|
Chris@439
|
496
|
Chris@726
|
497 Results that have different feature types should go into
|
Chris@726
|
498 different models.
|
Chris@726
|
499 */
|
Chris@439
|
500
|
Chris@726
|
501 Nodes sigs = m_store->match
|
Chris@726
|
502 (Triple(Node(), "a", m_store->expand("mo:Signal"))).a();
|
Chris@449
|
503
|
Chris@616
|
504 // Map from timeline uri to event type to dimensionality to
|
Chris@449
|
505 // presence of duration to model ptr. Whee!
|
Chris@449
|
506 std::map<QString, std::map<QString, std::map<int, std::map<bool, Model *> > > >
|
Chris@449
|
507 modelMap;
|
Chris@449
|
508
|
Chris@726
|
509 foreach (Node sig, sigs) {
|
Chris@726
|
510
|
Chris@726
|
511 Node interval = m_store->matchFirst(Triple(sig, "mo:time", Node())).c;
|
Chris@726
|
512 if (interval == Node()) continue;
|
Chris@439
|
513
|
Chris@726
|
514 Node tl = m_store->matchFirst(Triple(interval, "tl:onTimeLine", Node())).c;
|
Chris@726
|
515 if (tl == Node()) continue;
|
Chris@499
|
516
|
Chris@726
|
517 Nodes times = m_store->match(Triple(Node(), "tl:onTimeLine", tl)).a();
|
Chris@449
|
518
|
Chris@726
|
519 foreach (Node tn, times) {
|
Chris@726
|
520
|
Chris@726
|
521 Nodes timedThings = m_store->match(Triple(Node(), "event:time", tn)).a();
|
Chris@439
|
522
|
Chris@726
|
523 foreach (Node thing, timedThings) {
|
Chris@726
|
524
|
Chris@726
|
525 Node typ = m_store->matchFirst(Triple(thing, "a", Node())).c;
|
Chris@726
|
526 if (typ == Node()) continue;
|
Chris@439
|
527
|
Chris@726
|
528 Node valu = m_store->matchFirst(Triple(thing, "af:feature", Node())).c;
|
Chris@510
|
529
|
Chris@726
|
530 QString source = sig.value;
|
Chris@726
|
531 QString timeline = tl.value;
|
Chris@726
|
532 QString type = typ.value;
|
Chris@726
|
533 QString thinguri = thing.value;
|
Chris@510
|
534
|
Chris@726
|
535 /*
|
Chris@726
|
536 For sparse data, the determining factors in deciding
|
Chris@726
|
537 what model to use are: Do the features have values?
|
Chris@726
|
538 and Do the features have duration?
|
Chris@449
|
539
|
Chris@726
|
540 We can run through the results and check off whether
|
Chris@726
|
541 we find values and duration for each of the
|
Chris@726
|
542 source+type keys, and then run through the
|
Chris@726
|
543 source+type keys pushing each of the results into a
|
Chris@726
|
544 suitable model.
|
Chris@439
|
545
|
Chris@726
|
546 Unfortunately, at this point we do not yet have any
|
Chris@726
|
547 actual timing data (time/duration) -- just the time
|
Chris@726
|
548 URI.
|
Chris@449
|
549
|
Chris@726
|
550 What we _could_ do is to create one of each type of
|
Chris@726
|
551 model at the start, for each of the source+type
|
Chris@726
|
552 keys, and then push each feature into the relevant
|
Chris@726
|
553 model depending on what we find out about it. Then
|
Chris@726
|
554 return only non-empty models.
|
Chris@726
|
555 */
|
Chris@439
|
556
|
Chris@726
|
557 QString label = "";
|
Chris@726
|
558 bool text = (type.contains("Text") || type.contains("text")); // Ha, ha
|
Chris@726
|
559 bool note = (type.contains("Note") || type.contains("note")); // Guffaw
|
Chris@449
|
560
|
Chris@726
|
561 if (text) {
|
Chris@726
|
562 label = m_store->matchFirst(Triple(thing, "af:text", Node())).c.value;
|
Chris@726
|
563 }
|
Chris@726
|
564
|
Chris@726
|
565 if (label == "") {
|
Chris@726
|
566 label = m_store->matchFirst(Triple(thing, "rdfs:label", Node())).c.value;
|
Chris@726
|
567 }
|
Chris@449
|
568
|
Chris@726
|
569 RealTime time;
|
Chris@726
|
570 RealTime duration;
|
Chris@726
|
571
|
Chris@726
|
572 bool haveTime = false;
|
Chris@726
|
573 bool haveDuration = false;
|
Chris@726
|
574
|
Chris@726
|
575 Node at = m_store->matchFirst(Triple(tn, "tl:at", Node())).c;
|
Chris@726
|
576
|
Chris@726
|
577 if (at != Node()) {
|
Chris@726
|
578 time = RealTime::fromXsdDuration(at.value.toStdString());
|
Chris@726
|
579 haveTime = true;
|
Chris@726
|
580 } else {
|
Chris@726
|
581 //!!! NB we're using rather old terminology for these things, apparently:
|
Chris@726
|
582 // beginsAt -> start
|
Chris@726
|
583 // onTimeLine -> timeline
|
Chris@726
|
584
|
Chris@726
|
585 Node start = m_store->matchFirst(Triple(tn, "tl:beginsAt", Node())).c;
|
Chris@726
|
586 Node dur = m_store->matchFirst(Triple(tn, "tl:duration", Node())).c;
|
Chris@726
|
587 if (start != Node() && dur != Node()) {
|
Chris@726
|
588 time = RealTime::fromXsdDuration
|
Chris@726
|
589 (start.value.toStdString());
|
Chris@726
|
590 duration = RealTime::fromXsdDuration
|
Chris@726
|
591 (dur.value.toStdString());
|
Chris@726
|
592 haveTime = haveDuration = true;
|
Chris@726
|
593 }
|
Chris@726
|
594 }
|
Chris@726
|
595
|
Chris@726
|
596 QString valuestring = valu.value;
|
Chris@726
|
597 std::vector<float> values;
|
Chris@726
|
598
|
Chris@726
|
599 if (valuestring != "") {
|
Chris@726
|
600 QStringList vsl = valuestring.split(" ", QString::SkipEmptyParts);
|
Chris@726
|
601 for (int j = 0; j < vsl.size(); ++j) {
|
Chris@726
|
602 bool success = false;
|
Chris@726
|
603 float v = vsl[j].toFloat(&success);
|
Chris@726
|
604 if (success) values.push_back(v);
|
Chris@726
|
605 }
|
Chris@726
|
606 }
|
Chris@726
|
607
|
Chris@726
|
608 int dimensions = 1;
|
Chris@726
|
609 if (values.size() == 1) dimensions = 2;
|
Chris@726
|
610 else if (values.size() > 1) dimensions = 3;
|
Chris@726
|
611
|
Chris@726
|
612 Model *model = 0;
|
Chris@726
|
613
|
Chris@726
|
614 if (modelMap[timeline][type][dimensions].find(haveDuration) ==
|
Chris@726
|
615 modelMap[timeline][type][dimensions].end()) {
|
Chris@449
|
616
|
Chris@449
|
617 /*
|
Chris@690
|
618 SVDEBUG << "Creating new model: source = " << source << ", type = " << type << ", dimensions = "
|
Chris@449
|
619 << dimensions << ", haveDuration = " << haveDuration
|
Chris@449
|
620 << ", time = " << time << ", duration = " << duration
|
Chris@687
|
621 << endl;
|
Chris@449
|
622 */
|
Chris@449
|
623
|
Chris@726
|
624 if (!haveDuration) {
|
Chris@449
|
625
|
Chris@726
|
626 if (dimensions == 1) {
|
Chris@726
|
627 if (text) {
|
Chris@726
|
628 model = new TextModel(m_sampleRate, 1, false);
|
Chris@726
|
629 } else {
|
Chris@726
|
630 model = new SparseOneDimensionalModel(m_sampleRate, 1, false);
|
Chris@726
|
631 }
|
Chris@726
|
632 } else if (dimensions == 2) {
|
Chris@726
|
633 if (text) {
|
Chris@726
|
634 model = new TextModel(m_sampleRate, 1, false);
|
Chris@726
|
635 } else {
|
Chris@726
|
636 model = new SparseTimeValueModel(m_sampleRate, 1, false);
|
Chris@726
|
637 }
|
Chris@726
|
638 } else {
|
Chris@726
|
639 // We don't have a three-dimensional sparse model,
|
Chris@726
|
640 // so use a note model. We do have some logic (in
|
Chris@726
|
641 // extractStructure below) for guessing whether
|
Chris@726
|
642 // this should after all have been a dense model,
|
Chris@726
|
643 // but it's hard to apply it because we don't have
|
Chris@726
|
644 // all the necessary timing data yet... hmm
|
Chris@726
|
645 model = new NoteModel(m_sampleRate, 1, false);
|
Chris@726
|
646 }
|
Chris@449
|
647
|
Chris@726
|
648 } else { // haveDuration
|
Chris@510
|
649
|
Chris@726
|
650 if (note || (dimensions > 2)) {
|
Chris@726
|
651 model = new NoteModel(m_sampleRate, 1, false);
|
Chris@726
|
652 } else {
|
Chris@726
|
653 // If our units are frequency or midi pitch, we
|
Chris@726
|
654 // should be using a note model... hm
|
Chris@726
|
655 model = new RegionModel(m_sampleRate, 1, false);
|
Chris@726
|
656 }
|
Chris@510
|
657 }
|
Chris@449
|
658
|
Chris@726
|
659 model->setRDFTypeURI(type);
|
Chris@449
|
660
|
Chris@726
|
661 if (m_audioModelMap.find(source) != m_audioModelMap.end()) {
|
Chris@726
|
662 std::cerr << "source model for " << model << " is " << m_audioModelMap[source] << std::endl;
|
Chris@726
|
663 model->setSourceModel(m_audioModelMap[source]);
|
Chris@510
|
664 }
|
Chris@449
|
665
|
Chris@726
|
666 QString title = m_store->matchFirst
|
Chris@726
|
667 (Triple(typ, "dc:title", Node())).a.value;
|
Chris@726
|
668 if (title == "") {
|
Chris@726
|
669 // take it from the end of the event type
|
Chris@726
|
670 title = type;
|
Chris@726
|
671 title.replace(QRegExp("^.*[/#]"), "");
|
Chris@726
|
672 }
|
Chris@726
|
673 model->setObjectName(title);
|
Chris@449
|
674
|
Chris@726
|
675 modelMap[timeline][type][dimensions][haveDuration] = model;
|
Chris@726
|
676 models.push_back(model);
|
Chris@449
|
677 }
|
Chris@449
|
678
|
Chris@726
|
679 model = modelMap[timeline][type][dimensions][haveDuration];
|
Chris@449
|
680
|
Chris@726
|
681 if (model) {
|
Chris@726
|
682 long ftime = RealTime::realTime2Frame(time, m_sampleRate);
|
Chris@726
|
683 long fduration = RealTime::realTime2Frame(duration, m_sampleRate);
|
Chris@726
|
684 fillModel(model, ftime, fduration, haveDuration, values, label);
|
Chris@449
|
685 }
|
Chris@449
|
686 }
|
Chris@439
|
687 }
|
Chris@439
|
688 }
|
Chris@439
|
689 }
|
Chris@439
|
690
|
Chris@439
|
691 void
|
Chris@449
|
692 RDFImporterImpl::fillModel(Model *model,
|
Chris@449
|
693 long ftime,
|
Chris@449
|
694 long fduration,
|
Chris@449
|
695 bool haveDuration,
|
Chris@449
|
696 std::vector<float> &values,
|
Chris@449
|
697 QString label)
|
Chris@449
|
698 {
|
Chris@690
|
699 // SVDEBUG << "RDFImporterImpl::fillModel: adding point at frame " << ftime << endl;
|
Chris@492
|
700
|
Chris@449
|
701 SparseOneDimensionalModel *sodm =
|
Chris@449
|
702 dynamic_cast<SparseOneDimensionalModel *>(model);
|
Chris@449
|
703 if (sodm) {
|
Chris@449
|
704 SparseOneDimensionalModel::Point point(ftime, label);
|
Chris@449
|
705 sodm->addPoint(point);
|
Chris@449
|
706 return;
|
Chris@449
|
707 }
|
Chris@449
|
708
|
Chris@510
|
709 TextModel *tm =
|
Chris@510
|
710 dynamic_cast<TextModel *>(model);
|
Chris@510
|
711 if (tm) {
|
Chris@510
|
712 TextModel::Point point
|
Chris@510
|
713 (ftime,
|
Chris@510
|
714 values.empty() ? 0.5f : values[0] < 0.f ? 0.f : values[0] > 1.f ? 1.f : values[0], // I was young and feckless once too
|
Chris@510
|
715 label);
|
Chris@510
|
716 tm->addPoint(point);
|
Chris@510
|
717 return;
|
Chris@510
|
718 }
|
Chris@510
|
719
|
Chris@449
|
720 SparseTimeValueModel *stvm =
|
Chris@449
|
721 dynamic_cast<SparseTimeValueModel *>(model);
|
Chris@449
|
722 if (stvm) {
|
Chris@449
|
723 SparseTimeValueModel::Point point
|
Chris@449
|
724 (ftime, values.empty() ? 0.f : values[0], label);
|
Chris@449
|
725 stvm->addPoint(point);
|
Chris@449
|
726 return;
|
Chris@449
|
727 }
|
Chris@449
|
728
|
Chris@449
|
729 NoteModel *nm =
|
Chris@449
|
730 dynamic_cast<NoteModel *>(model);
|
Chris@449
|
731 if (nm) {
|
Chris@449
|
732 if (haveDuration) {
|
Chris@449
|
733 float value = 0.f, level = 1.f;
|
Chris@449
|
734 if (!values.empty()) {
|
Chris@449
|
735 value = values[0];
|
Chris@449
|
736 if (values.size() > 1) {
|
Chris@449
|
737 level = values[1];
|
Chris@449
|
738 }
|
Chris@449
|
739 }
|
Chris@449
|
740 NoteModel::Point point(ftime, value, fduration, level, label);
|
Chris@449
|
741 nm->addPoint(point);
|
Chris@449
|
742 } else {
|
Chris@449
|
743 float value = 0.f, duration = 1.f, level = 1.f;
|
Chris@449
|
744 if (!values.empty()) {
|
Chris@449
|
745 value = values[0];
|
Chris@449
|
746 if (values.size() > 1) {
|
Chris@449
|
747 duration = values[1];
|
Chris@449
|
748 if (values.size() > 2) {
|
Chris@449
|
749 level = values[2];
|
Chris@449
|
750 }
|
Chris@449
|
751 }
|
Chris@449
|
752 }
|
Chris@449
|
753 NoteModel::Point point(ftime, value, duration, level, label);
|
Chris@449
|
754 nm->addPoint(point);
|
Chris@449
|
755 }
|
Chris@449
|
756 return;
|
Chris@449
|
757 }
|
Chris@449
|
758
|
Chris@449
|
759 RegionModel *rm =
|
Chris@449
|
760 dynamic_cast<RegionModel *>(model);
|
Chris@449
|
761 if (rm) {
|
Chris@617
|
762 float value = 0.f;
|
Chris@617
|
763 if (values.empty()) {
|
Chris@617
|
764 // no values? map each unique label to a distinct value
|
Chris@617
|
765 if (m_labelValueMap[model].find(label) == m_labelValueMap[model].end()) {
|
Chris@617
|
766 m_labelValueMap[model][label] = rm->getValueMaximum() + 1.f;
|
Chris@617
|
767 }
|
Chris@617
|
768 value = m_labelValueMap[model][label];
|
Chris@617
|
769 } else {
|
Chris@617
|
770 value = values[0];
|
Chris@617
|
771 }
|
Chris@449
|
772 if (haveDuration) {
|
Chris@617
|
773 RegionModel::Point point(ftime, value, fduration, label);
|
Chris@449
|
774 rm->addPoint(point);
|
Chris@449
|
775 } else {
|
Chris@449
|
776 // This won't actually happen -- we only create region models
|
Chris@449
|
777 // if we do have duration -- but just for completeness
|
Chris@617
|
778 float duration = 1.f;
|
Chris@449
|
779 if (!values.empty()) {
|
Chris@449
|
780 value = values[0];
|
Chris@449
|
781 if (values.size() > 1) {
|
Chris@449
|
782 duration = values[1];
|
Chris@449
|
783 }
|
Chris@449
|
784 }
|
Chris@449
|
785 RegionModel::Point point(ftime, value, duration, label);
|
Chris@449
|
786 rm->addPoint(point);
|
Chris@449
|
787 }
|
Chris@449
|
788 return;
|
Chris@449
|
789 }
|
Chris@449
|
790
|
Chris@449
|
791 std::cerr << "WARNING: RDFImporterImpl::fillModel: Unknown or unexpected model type" << std::endl;
|
Chris@449
|
792 return;
|
Chris@449
|
793 }
|
Chris@449
|
794
|
Chris@490
|
795 RDFImporter::RDFDocumentType
|
Chris@490
|
796 RDFImporter::identifyDocumentType(QString url)
|
Chris@490
|
797 {
|
Chris@490
|
798 bool haveAudio = false;
|
Chris@490
|
799 bool haveAnnotations = false;
|
Chris@726
|
800 bool haveRDF = false;
|
Chris@449
|
801
|
Chris@726
|
802 BasicStore *store = 0;
|
Chris@726
|
803
|
Chris@726
|
804 // This is not expected to return anything useful, but if it does
|
Chris@726
|
805 // anything at all then we know we have RDF
|
Chris@726
|
806 try {
|
Chris@727
|
807 //!!! non-local document? + may throw!!!
|
Chris@726
|
808 store = BasicStore::load(QUrl(url));
|
Chris@726
|
809 Triple t = store->matchFirst(Triple());
|
Chris@726
|
810 if (t != Triple()) haveRDF = true;
|
Chris@726
|
811 } catch (...) {
|
Chris@726
|
812 }
|
Chris@726
|
813
|
Chris@726
|
814 if (!haveRDF) {
|
Chris@726
|
815 delete store;
|
Chris@499
|
816 return NotRDF;
|
Chris@499
|
817 }
|
Chris@499
|
818
|
Chris@726
|
819 store->addPrefix("mo", Uri("http://purl.org/ontology/mo/"));
|
Chris@726
|
820 store->addPrefix("event", Uri("http://purl.org/NET/c4dm/event.owl#"));
|
Chris@726
|
821 store->addPrefix("af", Uri("http://purl.org/ontology/af/"));
|
Chris@726
|
822
|
Chris@588
|
823 // "MO-conformant" structure for audio files
|
Chris@588
|
824
|
Chris@726
|
825 Node n = store->matchFirst(Triple(Node(), "a", store->expand("mo:AudioFile"))).a;
|
Chris@726
|
826 if (n != Node() && n.type == Node::URI) {
|
Chris@588
|
827
|
Chris@490
|
828 haveAudio = true;
|
Chris@588
|
829
|
Chris@588
|
830 } else {
|
Chris@588
|
831
|
Chris@588
|
832 // Sonic Annotator v0.2 and below used to write this structure
|
Chris@588
|
833 // (which is not properly in conformance with the Music
|
Chris@588
|
834 // Ontology)
|
Chris@588
|
835
|
Chris@726
|
836 Nodes sigs = store->match(Triple(Node(), "a", store->expand("mo:Signal"))).a();
|
Chris@726
|
837 foreach (Node sig, sigs) {
|
Chris@726
|
838 Node aa = store->matchFirst(Triple(sig, "mo:available_as", Node())).c;
|
Chris@726
|
839 if (aa != Node()) {
|
Chris@726
|
840 haveAudio = true;
|
Chris@726
|
841 break;
|
Chris@726
|
842 }
|
Chris@588
|
843 }
|
Chris@490
|
844 }
|
Chris@490
|
845
|
Chris@690
|
846 SVDEBUG << "NOTE: RDFImporter::identifyDocumentType: haveAudio = "
|
Chris@687
|
847 << haveAudio << endl;
|
Chris@616
|
848
|
Chris@726
|
849 n = store->matchFirst(Triple(Node(), "event:time", Node())).a;
|
Chris@726
|
850 if (n != Node()) {
|
Chris@490
|
851 haveAnnotations = true;
|
Chris@490
|
852 }
|
Chris@490
|
853
|
Chris@490
|
854 if (!haveAnnotations) {
|
Chris@726
|
855 n = store->matchFirst(Triple(Node(), "af:signal_feature", Node())).a;
|
Chris@726
|
856 if (n != Node()) {
|
Chris@490
|
857 haveAnnotations = true;
|
Chris@490
|
858 }
|
Chris@490
|
859 }
|
Chris@490
|
860
|
Chris@690
|
861 SVDEBUG << "NOTE: RDFImporter::identifyDocumentType: haveAnnotations = "
|
Chris@687
|
862 << haveAnnotations << endl;
|
Chris@616
|
863
|
Chris@726
|
864 delete store;
|
Chris@542
|
865
|
Chris@490
|
866 if (haveAudio) {
|
Chris@490
|
867 if (haveAnnotations) {
|
Chris@490
|
868 return AudioRefAndAnnotations;
|
Chris@490
|
869 } else {
|
Chris@490
|
870 return AudioRef;
|
Chris@490
|
871 }
|
Chris@490
|
872 } else {
|
Chris@490
|
873 if (haveAnnotations) {
|
Chris@490
|
874 return Annotations;
|
Chris@490
|
875 } else {
|
Chris@499
|
876 return OtherRDFDocument;
|
Chris@490
|
877 }
|
Chris@490
|
878 }
|
Chris@492
|
879
|
Chris@542
|
880 return OtherRDFDocument;
|
Chris@490
|
881 }
|
Chris@490
|
882
|