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