# HG changeset patch
# User Chris Cannam
# Date 1228748919 0
# Node ID 7207e3eba44f15bb62dc2f4d1c412ce08e3f61d7
# Parent  af7b6e55895beb1b70a2a3dd0e3a29dd94f4f913
* Ensure SimpleSPARQLQuery stores an error string properly when query
  fails -- so (apart from anything else) RDFImporter::identifyDocumentType
  returns a sensible result for non-RDF

diff -r af7b6e55895b -r 7207e3eba44f data/model/Model.cpp
--- a/data/model/Model.cpp	Mon Dec 08 11:53:10 2008 +0000
+++ b/data/model/Model.cpp	Mon Dec 08 15:08:39 2008 +0000
@@ -59,7 +59,7 @@
 void
 Model::aboutToDelete()
 {
-    std::cerr << "Model(" << this << ")::aboutToDelete()" << std::endl;
+//    std::cerr << "Model(" << this << ")::aboutToDelete()" << std::endl;
 
     if (m_aboutToDelete) {
         std::cerr << "WARNING: Model(" << this << ", \""
diff -r af7b6e55895b -r 7207e3eba44f rdf/SimpleSPARQLQuery.cpp
--- a/rdf/SimpleSPARQLQuery.cpp	Mon Dec 08 11:53:10 2008 +0000
+++ b/rdf/SimpleSPARQLQuery.cpp	Mon Dec 08 15:08:39 2008 +0000
@@ -449,13 +449,13 @@
     }
 
     if (!results) {
-        cerr << "SimpleSPARQLQuery: LIBRDF query failed" << endl;
+        m_errorString = "RDF query failed";
         librdf_free_query(query);
         return list;
     }
 
     if (!librdf_query_results_is_bindings(results)) {
-        cerr << "SimpleSPARQLQuery: LIBRDF query has wrong result type (not bindings)" << endl;
+        m_errorString = "RDF query returned non-bindings results";
         librdf_free_query_results(results);
         librdf_free_query(query);
         return list;