comparison import/Import.cpp @ 2:ff067a1e7e3d classical-rdf

* work on conductors etc

 void
 assignUri(Store *s, Work *w, Composer *c)
 {
     QString pfx = c->property("uri").toUrl().toString();
     DEBUG << "pfx = " << pfx << endl;
-    if (!pfx.contains("composer/")) pfx = "";
+    if (!pfx.contains("composer/")) pfx = ":work/";
+    else {
+        pfx.replace("composer/", "work/");
+        pfx += "/";
+    }
 
     static QSet<QString> convSet;
 
     QString conv = w->catalogue();
     if (conv == "") conv = w->opus();

     conv.replace(" ", "_");
     conv.replace("-", "_");
     conv.replace(":", "_");
     conv.replace(QRegExp("[^a-zA-Z0-9_-]"), "");
 
-    if (pfx != "") conv = pfx + "/work/" + conv;
+    if (pfx != "") conv = pfx + conv;
 
     // I think actually for works we want to merge duplicates rather than
     // assign them separate URIs, _unless_ they lack a viable opus number
     if (!hasOpus) {
         QString initial = conv;

         std::cerr << "Caught RDF exception: " << e.what() << std::endl;
     }
 
     DEBUG << "Stored, now saving" << endl;
 
-    outstore->save("test-out.ttl");
+    outstore->save("imported.ttl");
 
     DEBUG << "Saved" << endl;
 
 
     QMultiMap<QString, Composer *> cmap;