comparison data/fileio/SparqlRelatedMediaReader.cpp @ 257:057856cf81a2

reformat the InfoWidget and integrate the related media query

 
 #include "SparqlRelatedMediaReader.h"
 
 #include <iostream>
 
-SparqlRelatedMediaReader::SparqlRelatedMediaReader(std::list<QString> *relMediaList) : 
+SparqlRelatedMediaReader::SparqlRelatedMediaReader(std::map<QString, QString> *relMediaList) : 
 	m_relMediaList(relMediaList)
 {}
 
 bool SparqlRelatedMediaReader::parse(const QString & filename)
 {

 	}
 	
 	return false;
 }
 
-SparqlRelatedMediaHandler::SparqlRelatedMediaHandler(std::list<QString> *relMediaList) : QXmlDefaultHandler(),
+SparqlRelatedMediaHandler::SparqlRelatedMediaHandler(std::map<QString, QString> *relMediaList) : QXmlDefaultHandler(),
 	m_relMediaList(relMediaList),
-	m_inBinding(false),
-	m_curBindingName("")
+	m_inUriBinding(false),
+	m_inLiteralBinding(false),
+	m_curUriName("")
 {}
 
 bool SparqlRelatedMediaHandler::startElement(const QString &namespaceURI, const QString &localName,
 						  const QString &qName, const QXmlAttributes &attributes)
 {

     } else if (name == "binding") {
 	
 		// nothing needed
 		ok = true;
 
-    } else if ( (name == "uri") || (name == "literal") ) {
-		m_inBinding = true;	
+    //} else if ( (name == "uri") || (name == "literal") ) {
+	} else if (name == "uri") {
+		m_inUriBinding = true;	
+		ok = true;
+	} else if (name == "literal") {
+		m_inLiteralBinding = true;	
 		ok = true;
 	}
 
     if (!ok) {
 		std::cerr << "WARNING: SparqlResultsHandler-XML: Failed to completely process element \""

 bool SparqlRelatedMediaHandler::endElement(const QString &namespaceURI, const QString &localName,
 						const QString &qName)
 {
 	QString name = qName.toLower();
 
-	if ( (name == "uri") || (name == "literal") )
+	//if ( (name == "uri") || (name == "literal") )
+	if (name == "uri")
 	{
-		m_inBinding = false;
+		m_inUriBinding = false;
+	}
+	if (name == "literal")
+	{
+		m_inLiteralBinding = false;
 	}
 
 	return true;
 }
 
 bool SparqlRelatedMediaHandler::characters(const QString &str)
 {
-	if (m_inBinding)
+	if (m_inUriBinding)
 	{
-		m_relMediaList->push_back(str);
+		m_curUriName = str;
+		
+	} else if (m_inLiteralBinding)
+	{
+		m_relMediaList->insert(std::make_pair(m_curUriName,str));
 	}
 
     return true;
 }