Mercurial > hg > svapp
changeset 148:7dca51571320 sv-v1.4rc1
* Ensure SimpleSPARQLQuery stores an error string properly when query
fails -- so (apart from anything else) RDFImporter::identifyDocumentType
returns a sensible result for non-RDF
| author | Chris Cannam |
|---|---|
| date | Mon, 08 Dec 2008 15:08:39 +0000 |
| parents | c02706551309 |
| children | b774a451b093 |
| files | framework/MainWindowBase.cpp |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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);