comparison import/Import.cpp @ 28:7d8a6167febb classical-rdf

* Begin new text entry / search widget & test utility for it
* Improve typing matching methods
* Update code to use ObjectLoader/Storer instead of old-style ObjectMapper

 
 #include "Objects.h"
 
 #include <dataquay/BasicStore.h>
 #include <dataquay/RDFException.h>
-#include <dataquay/objectmapper/ObjectMapper.h>
+#include <dataquay/objectmapper/ObjectStorer.h>
+#include <dataquay/objectmapper/ObjectLoader.h>
 #include <dataquay/objectmapper/ObjectBuilder.h>
+#include <dataquay/objectmapper/TypeMapping.h>
 #include <dataquay/objectmapper/ContainerBuilder.h>
 
 #include "ImportClassicalComposersOrg.h"
 #include "ImportClassicalDotNet.h"
 #include "ImportClassicalArchives.h"

 	<WikipediaWorksListImporter>("ClassicalData::WikipediaWorksListImporter*");
     ObjectBuilder::getInstance()->registerClass
 	<HobokenImporter>("ClassicalData::HobokenImporter*");
 
     BasicStore *store = BasicStore::load(QUrl("file:importers.ttl"));
-    ObjectMapper mapper(store);
-    QObject *parentObject = mapper.loadAllObjects(new QObject());
+    ObjectLoader loader(store);
+    QObject *parentObject = loader.loadAllObjects(new QObject());
     
     BasicStore *outstore = new BasicStore();
     outstore->setBaseUri(Uri("http://dbtune.org/classical/resource/"));
-    ObjectMapper outmapper(outstore);
+    ObjectStorer storer(outstore);
+    TypeMapping tm;
 
     TypeRegistrar::registerTypes();
-    TypeRegistrar::addMappings(outstore, &outmapper);
-
-    outmapper.setPropertyStorePolicy(ObjectMapper::StoreIfChanged);
-    outmapper.setObjectStorePolicy(ObjectMapper::StoreAllObjects);
-    outmapper.setBlankNodePolicy(ObjectMapper::NoBlankNodes);
+    TypeRegistrar::addMappings(outstore, &tm);
+
+    storer.setTypeMapping(tm);
+    storer.setPropertyStorePolicy(ObjectStorer::StoreIfChanged);
+    storer.setObjectStorePolicy(ObjectStorer::StoreAllObjects);
+    storer.setBlankNodePolicy(ObjectStorer::NoBlankNodes);
 
     QList<Importer *> importers = parentObject->findChildren<Importer *>();
     std::cerr << "have " << importers.size() << " importers" << std::endl;
 
     ComposerMap composers;

             if (u != "") storedUris.insert(u);
         }
     }
 
     try {
-        outmapper.storeAllObjects(toStore);
+        storer.storeAllObjects(toStore);
         
     } catch (RDFException e) {
         std::cerr << "Caught RDF exception: " << e.what() << std::endl;
     }