comparison data/fileio/QueryConfigReader.cpp @ 227:59d84a8bb76c

compatibility with changes done for the web site:
- easaier servlet name changed
- new queryfield.xml ("range" attributes form)

 }
 
 QueryConfigHandler::QueryConfigHandler(QueryModel * queryModel) : QXmlDefaultHandler(),
 	m_inTheme(false),
 	m_inFieldGroup(false),
+	m_inBinding(false),
+	m_propertyName(""),
 	m_queryModel(queryModel)
 {}
 
 bool QueryConfigHandler::startElement(const QString &namespaceURI, const QString &localName,
 						  const QString &qName, const QXmlAttributes &attributes)

 		ok = true;
     
     } else if (name == "field") {
 	
 		ok = true;
-		QString name	= attributes.value("name");
+		m_propertyName	= attributes.value("name");
 		QString label	= attributes.value("label");
 		QString type	= attributes.value("xsi:type");
 		QString range	= attributes.value("range");
 		QString unit	= attributes.value("unit");
 		QString comment	= attributes.value("comment");
-		m_queryModel->addProperty(name, label, type, range, unit, comment);
+		m_queryModel->addProperty(m_propertyName, label, type, range, unit, comment);
 
-    }
+    } else if (name == "range") {
+
+		m_inBinding = true;
+		ok = true;
+	}
 
     if (!ok) {
 		std::cerr << "WARNING: QueryConfigReader-XML: Failed to completely process element \""
 		  << name.toLocal8Bit().data() << "\"" << std::endl;
     }

     } 
 	else if (name == "fieldgroup") 
 	{
         m_inFieldGroup = false;
     } 
+	else if (name == "range") 
+	{
+        m_inBinding = false;
+    } 
 
 	return true;
 }
 
 bool QueryConfigHandler::characters(const QString &str)
 {
 	bool ok = false;
+
+	if (m_inBinding)
+	{
+		m_queryModel->addRange(m_propertyName, str);
+	}
 
     return true;
 }
 
 bool QueryConfigHandler::error(const QXmlParseException &exception)