comparison rdf/SimpleSPARQLQuery.cpp @ 526:8878efd21dbc

* The main fix here is to the arguments of SVApplication -- the first
one should be int& rather than int (was causing a crash! gah!)
  Various other tiny fixes

     QString getErrorString() const;
 
 protected:
     static QMutex m_mutex;
 
-    static WredlandWorldWrapper m_redland;
+    static WredlandWorldWrapper *m_redland;
 
     ResultList executeDirectParser();
     ResultList executeDatastore();
     ResultList executeFor(QString modelUri);
 

     QString m_errorString;
     ProgressReporter *m_reporter;
     bool m_cancelled;
 };
 
-WredlandWorldWrapper SimpleSPARQLQuery::Impl::m_redland;
+WredlandWorldWrapper *SimpleSPARQLQuery::Impl::m_redland = 0;
 
 QMutex SimpleSPARQLQuery::Impl::m_mutex;
 
 SimpleSPARQLQuery::SimpleSPARQLQuery(QueryType type, QString query) :
     m_impl(new Impl(type, query))

 {
     ResultList list;
 
     QMutexLocker locker(&m_mutex);
 
-    if (!m_redland.isOK()) {
+    if (!m_redland) {
+        m_redland = new WredlandWorldWrapper();
+    }
+
+    if (!m_redland->isOK()) {
         cerr << "ERROR: SimpleSPARQLQuery::execute: Failed to initialise Redland datastore" << endl;
         return list;
     }
 
     if (m_type == QueryFromSingleSource) {

 #endif
 
     {
         Profiler p("SimpleSPARQLQuery: Prepare LIBRDF query");
         query = librdf_new_query
-            (m_redland.getWorld(), "sparql", NULL,
+            (m_redland->getWorld(), "sparql", NULL,
              (const unsigned char *)m_query.toUtf8().data(), NULL);
     }
     
     if (!query) {
         m_errorString = "Failed to construct query";

     }
 
     librdf_query_results *results;
     {
         Profiler p("SimpleSPARQLQuery: Execute LIBRDF query");
-        results = librdf_query_execute(query, m_redland.getModel(modelUri));
+        results = librdf_query_execute(query, m_redland->getModel(modelUri));
     }
 
     if (!results) {
         m_errorString = "RDF query failed";
         librdf_free_query(query);

 {
     QString err;
 
     QMutexLocker locker(&m_mutex);
 
-    if (!m_redland.isOK()) {
+    if (!m_redland->isOK()) {
         std::cerr << "SimpleSPARQLQuery::addSourceToModel: Failed to initialise Redland datastore" << std::endl;
         return false;
     }
 
-    if (!m_redland.loadUriIntoDefaultModel(sourceUri, err)) {
+    if (!m_redland->loadUriIntoDefaultModel(sourceUri, err)) {
         std::cerr << "SimpleSPARQLQuery::addSourceToModel: Failed to add source URI \"" << sourceUri.toStdString() << ": " << err.toStdString() << std::endl;
         return false;
     }
     return true;
 }

 void
 SimpleSPARQLQuery::Impl::closeSingleSource(QString sourceUri)
 {
     QMutexLocker locker(&m_mutex);
 
-    m_redland.freeModel(sourceUri);
+    m_redland->freeModel(sourceUri);
 }
 
 SimpleSPARQLQuery::Value
 SimpleSPARQLQuery::singleResultQuery(QueryType type,
                                      QString query, QString binding)