comparison rdf/PluginRDFIndexer.cpp @ 481:a82645e788fc

* Auto-select RDF datastore/parsing backend; use trees datastore if
available
* Make CachedFile remember whether a file has already been successfully
located locally (avoiding system call out to look at filesystem)

 
         localString = "file://" + cf.getLocalFilename(); //!!! crud - fix!
     }
 
 //    cerr << "PluginRDFIndexer::indexURL: url = <" << urlString.toStdString() << ">" << endl;
-
+/*!!!
     SimpleSPARQLQuery query
         (localString,
          QString
          (
              " PREFIX vamp: <http://purl.org/ontology/vamp/> "

              "              vamp:identifier ?library_id "
              "   } "
              " } "
              )
          .arg(localString));
+*/
+    SimpleSPARQLQuery query
+        (localString,
+         QString
+         (
+             " PREFIX vamp: <http://purl.org/ontology/vamp/> "
+
+             " SELECT ?plugin ?library ?plugin_id "
+             " FROM <%1> "
+
+             " WHERE { "
+             "   ?plugin a vamp:Plugin . "
+             "   ?plugin vamp:identifier ?plugin_id . "
+
+             "   OPTIONAL { "
+             "     ?library vamp:available_plugin ?plugin "
+             "   } "
+             " } "
+             )
+         .arg(localString));
 
     SimpleSPARQLQuery::ResultList results = query.execute();
 
     if (!query.isOK()) {
         cerr << "ERROR: PluginRDFIndexer::indexURL: ERROR: Failed to index document at <"

 
     for (SimpleSPARQLQuery::ResultList::iterator i = results.begin();
          i != results.end(); ++i) {
 
         QString pluginUri = (*i)["plugin"].value;
-        QString soname = (*i)["library_id"].value;
+//!!!        QString soname = (*i)["library_id"].value;
+        QString soUri = (*i)["library"].value;
         QString identifier = (*i)["plugin_id"].value;
 
         if (identifier == "") {
             cerr << "PluginRDFIndexer::indexURL: NOTE: Document at <"
                  << urlString.toStdString()
                  << "> fails to define any vamp:identifier for plugin <"
                  << pluginUri.toStdString() << ">"
                  << endl;
             continue;
         }
-        if (soname == "") {
+        if (soUri == "") {
             cerr << "PluginRDFIndexer::indexURL: NOTE: Document at <"
                  << urlString.toStdString() << "> does not associate plugin <"
                  << pluginUri.toStdString() << "> with any implementation library"
                  << endl;
             continue;
         }
+
+        QString sonameQuery =
+            QString(
+                " PREFIX vamp: <http://purl.org/ontology/vamp/> "
+                " SELECT ?library_id "
+                " FROM <%1> "
+                " WHERE { "
+                "   <%2> vamp:identifier ?library_id "
+                " } "
+                )
+            .arg(localString)
+            .arg(soUri);
+
+        SimpleSPARQLQuery::Value sonameValue = 
+            SimpleSPARQLQuery::singleResultQuery(localString, sonameQuery, "library_id");
+        QString soname = sonameValue.value;
+        if (soname == "") {
+            cerr << "PluginRDFIndexer::indexURL: NOTE: Document at <"
+                 << urlString.toStdString() << "> omits identifier for library <"
+                 << soUri.toStdString() << ">"
+                 << endl;
+            continue;
+        }
+
+
 /*
         cerr << "PluginRDFIndexer::indexURL: Document for plugin \""
              << soname.toStdString() << ":" << identifier.toStdString()
              << "\" (uri <" << pluginUri.toStdString() << ">) is at url <"
              << urlString.toStdString() << ">" << endl;