--- infoscreen/screenxmlhandler.cpp	2010/03/29 09:34:16	637
+++ infoscreen/screenxmlhandler.cpp	2010/04/07 17:00:07	638
@@ -2,7 +2,7 @@
 
 #include "httpwrapper.h"
 
-//#include <QDebug>
+#include <QDebug>
 
 ScreenXmlHandler::ScreenXmlHandler()
 {
@@ -40,6 +40,22 @@
     return true;
 }
 
+ModuleType ScreenXmlHandler::stringToModule(QString name) {
+    ModuleType type;
+
+    if (name == "info_image") {
+        type = ModuleImage;
+    } else if ( name == "info_web") {
+        type = ModuleWeb;
+    } else if (name == "info_video") {
+        type = ModuleVideo;
+    } else {
+        type = ModuleUnknown;
+        qDebug() << "Unknown module " << name;
+    }
+    return type;
+}
+
 bool ScreenXmlHandler::endElement(const QString &namespaceURI, const QString &localName, const QString &qName)
 {
     Q_UNUSED(namespaceURI);
@@ -47,7 +63,7 @@
     //qDebug() << "XML-stop:" << qName;
 
     if (qName == "module") {
-        tempItem.module = currentText;
+        tempItem.module = stringToModule(currentText);
     }
     if (qName == "elementid") {
         tempItem.elementid = currentText.toInt();