# HG changeset patch
# User Chris Cannam
# Date 1228748919 0
# Node ID 7dca515713202773bb0bb093e0505861e6d8f162
# Parent  c02706551309ee61a7dcba66c676638c5314f425
* 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 c02706551309 -r 7dca51571320 framework/MainWindowBase.cpp
--- a/framework/MainWindowBase.cpp	Fri Dec 05 18:45:49 2008 +0000
+++ b/framework/MainWindowBase.cpp	Mon Dec 08 15:08:39 2008 +0000
@@ -868,6 +868,7 @@
         RDFImporter::RDFDocumentType rdfType = 
             RDFImporter::identifyDocumentType
             (QUrl::fromLocalFile(source.getLocalFilename()).toString());
+//        std::cerr << "RDF type: " << (int)rdfType << std::endl;
         if (rdfType == RDFImporter::AudioRefAndAnnotations ||
             rdfType == RDFImporter::AudioRef) {
             rdfSession = true;
@@ -1178,6 +1179,8 @@
     RDFImporter::RDFDocumentType rdfType = 
         RDFImporter::identifyDocumentType(QUrl::fromLocalFile(path).toString());
 
+//    std::cerr << "RDF type:  (in layer) " << (int) rdfType << std::endl;
+
     if (rdfType != RDFImporter::NotRDF) {
 
         return openLayersFromRDF(source);
@@ -1350,6 +1353,8 @@
             RDFImporter::identifyDocumentType
             (QUrl::fromLocalFile(source.getLocalFilename()).toString());
 
+//        std::cerr << "RDF type: " << (int)rdfType << std::endl;
+
         if (rdfType == RDFImporter::AudioRefAndAnnotations ||
             rdfType == RDFImporter::AudioRef) {
             return openSessionFromRDF(source);