[Sv1-commits] SF.net SVN: sv1:[1544] sonic-visualiser/trunk/rdf/RDFImporter.cpp
Brought to you by:
cannam
From: <ca...@us...> - 2009-05-13 14:22:16
|
Revision: 1544 http://sv1.svn.sourceforge.net/sv1/?rev=1544&view=rev Author: cannam Date: 2009-05-13 13:30:08 +0000 (Wed, 13 May 2009) Log Message: ----------- * Try to identify the properly conformant audio file structure written out by Sonic Annotator (but we still don't actually import it yet) Modified Paths: -------------- sonic-visualiser/trunk/rdf/RDFImporter.cpp Modified: sonic-visualiser/trunk/rdf/RDFImporter.cpp =================================================================== --- sonic-visualiser/trunk/rdf/RDFImporter.cpp 2009-05-13 12:59:07 UTC (rev 1543) +++ sonic-visualiser/trunk/rdf/RDFImporter.cpp 2009-05-13 13:30:08 UTC (rev 1544) @@ -947,18 +947,41 @@ return NotRDF; } + // "MO-conformant" structure for audio files + SimpleSPARQLQuery::Value value = SimpleSPARQLQuery::singleResultQuery (SimpleSPARQLQuery::QueryFromSingleSource, QString (" PREFIX mo: <http://purl.org/ontology/mo/> " " SELECT ?url FROM <%1> " - " WHERE { ?signal a mo:Signal ; mo:available_as ?url } " + " WHERE { ?url a mo:AudioFile } " ).arg(url), "url"); if (value.type == SimpleSPARQLQuery::URIValue) { + haveAudio = true; + + } else { + + // Sonic Annotator v0.2 and below used to write this structure + // (which is not properly in conformance with the Music + // Ontology) + + value = + SimpleSPARQLQuery::singleResultQuery + (SimpleSPARQLQuery::QueryFromSingleSource, + QString + (" PREFIX mo: <http://purl.org/ontology/mo/> " + " SELECT ?url FROM <%1> " + " WHERE { ?signal a mo:Signal ; mo:available_as ?url } " + ).arg(url), + "url"); + + if (value.type == SimpleSPARQLQuery::URIValue) { + haveAudio = true; + } } value = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |