# HG changeset patch
# User Chris Cannam
# Date 1259947462 0
# Node ID ff067a1e7e3d66d0a0f3e30f15aa971e80791932
# Parent  29ca5974905dbef1fd89d0b67e65bbbdd0737d7a
* work on conductors etc

diff -r 29ca5974905d -r ff067a1e7e3d import/Import.cpp
--- a/import/Import.cpp	Thu Dec 03 15:42:10 2009 +0000
+++ b/import/Import.cpp	Fri Dec 04 17:24:22 2009 +0000
@@ -426,7 +426,11 @@
 {
     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;
 
@@ -442,7 +446,7 @@
     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
@@ -770,7 +774,7 @@
 
     DEBUG << "Stored, now saving" << endl;
 
-    outstore->save("test-out.ttl");
+    outstore->save("imported.ttl");
 
     DEBUG << "Saved" << endl;
 
diff -r 29ca5974905d -r ff067a1e7e3d import/import.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/import/import.pro	Fri Dec 04 17:24:22 2009 +0000
@@ -0,0 +1,26 @@
+TEMPLATE = app
+TARGET = importer
+CONFIG += debug
+DEPENDPATH += .
+INCLUDEPATH += . ../common ../../turbot
+
+OBJECTS_DIR = o
+MOC_DIR = m
+
+PRE_TARGETDEPS += ../common/libcommon.a
+
+LIBS += ../common/libcommon.a ../../turbot/dataquay/libdataquay.a ../../turbot/ext/libext.a
+
+# Input
+HEADERS += Importer.h ImportClassicalComposersOrg.h ImportClassicalDotNet.h ImportHoboken.h ImportWikipediaComposers.h ImportWikipediaWorks.h ImportWikipediaWorksK.h ImportWikipediaWorksList.h
+SOURCES += Import.cpp ImportClassicalComposersOrg.cpp ImportClassicalDotNet.cpp ImportHoboken.cpp ImportWikipediaComposers.cpp ImportWikipediaWorks.cpp ImportWikipediaWorksK.cpp ImportWikipediaWorksList.cpp
+
+solaris* {
+	 
+	debug {
+              QMAKE_CXXFLAGS_DEBUG += -xprofile=tcov
+	      LIBS += -xprofile=tcov
+	}
+
+}
+