diff rdf/RDFImporter.cpp @ 480:3ffce691c9bf

* Add Redland datastore support to SimpleSPARQLQuery

--- a/rdf/RDFImporter.cpp	Wed Nov 12 16:39:29 2008 +0000
+++ b/rdf/RDFImporter.cpp	Thu Nov 13 14:23:23 2008 +0000
@@ -157,7 +157,8 @@
                                     ProgressReporter *reporter)
 {
     SimpleSPARQLQuery query = SimpleSPARQLQuery
-        (QString
+        (m_uristring,
+         QString
          (
              " PREFIX mo: <http://purl.org/ontology/mo/>"
              " PREFIX af: <http://purl.org/ontology/af/>"
@@ -288,7 +289,8 @@
             );
 
     SimpleSPARQLQuery::Value dimensionsValue =
-        SimpleSPARQLQuery::singleResultQuery(dimensionsQuery
+        SimpleSPARQLQuery::singleResultQuery(m_uristring,
+                                             dimensionsQuery
                                              .arg(m_uristring).arg(featureUri),
                                              "dimensions");
 
@@ -329,7 +331,8 @@
     // multiple optionals properly
 
     SimpleSPARQLQuery::Value srValue = 
-        SimpleSPARQLQuery::singleResultQuery(queryTemplate
+        SimpleSPARQLQuery::singleResultQuery(m_uristring,
+                                             queryTemplate
                                              .arg(m_uristring).arg(featureUri)
                                              .arg("sampleRate"),
                                              "sampleRate");
@@ -338,7 +341,8 @@
     }
 
     SimpleSPARQLQuery::Value hopValue = 
-        SimpleSPARQLQuery::singleResultQuery(queryTemplate
+        SimpleSPARQLQuery::singleResultQuery(m_uristring,
+                                             queryTemplate
                                              .arg(m_uristring).arg(featureUri)
                                              .arg("hopSize"),
                                              "hopSize");
@@ -347,7 +351,8 @@
     }
 
     SimpleSPARQLQuery::Value winValue = 
-        SimpleSPARQLQuery::singleResultQuery(queryTemplate
+        SimpleSPARQLQuery::singleResultQuery(m_uristring,
+                                             queryTemplate
                                              .arg(m_uristring).arg(featureUri)
                                              .arg("windowLength"),
                                              "windowLength");
@@ -455,7 +460,7 @@
 
         ).arg(m_uristring);
 
-    SimpleSPARQLQuery query(queryString);
+    SimpleSPARQLQuery query(m_uristring, queryString);
     query.setProgressReporter(reporter);
 
     cerr << "Query will be: " << queryString.toStdString() << endl;
@@ -517,9 +522,9 @@
         bool haveDuration = false;
 
         QString label = SimpleSPARQLQuery::singleResultQuery
-            (labelQueryString.arg(thinguri), "label").value;
+            (m_uristring, labelQueryString.arg(thinguri), "label").value;
 
-        SimpleSPARQLQuery rangeQuery(rangeQueryString.arg(thinguri));
+        SimpleSPARQLQuery rangeQuery(m_uristring, rangeQueryString.arg(thinguri));
         SimpleSPARQLQuery::ResultList rangeResults = rangeQuery.execute();
         if (!rangeResults.empty()) {
 //                std::cerr << rangeResults.size() << " range results" << std::endl;
@@ -532,7 +537,7 @@
             haveDuration = true;
         } else {
             QString timestring = SimpleSPARQLQuery::singleResultQuery
-                (timeQueryString.arg(thinguri), "time").value;
+                (m_uristring, timeQueryString.arg(thinguri), "time").value;
             if (timestring != "") {
                 time = RealTime::fromXsdDuration(timestring.toStdString());
                 haveTime = true;