More output on errors.

[toast/confclerk.git] / src / sql / schedulexmlparser.cpp

diff --git a/src/sql/schedulexmlparser.cpp b/src/sql/schedulexmlparser.cpp
index 8ce0a6812850e47f7ae09dd15ee5946f19fee670..5289c203bd7ecd86a1b28838f2cc7e339cdd579f 100644 (file)
--- a/src/sql/schedulexmlparser.cpp
+++ b/src/sql/schedulexmlparser.cpp
@@ -1,20 +1,21 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann
  *
- * This file is part of fosdem-schedule.
+ * This file is part of ConfClerk.
  *
- * fosdem-schedule is free software: you can redistribute it and/or modify it
+ * ConfClerk is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation, either version 2 of the License, or (at your option)
  * any later version.
  *
- * fosdem-schedule is distributed in the hope that it will be useful, but
+ * ConfClerk is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * fosdem-schedule.  If not, see <http://www.gnu.org/licenses/>.
+ * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <QDomDocument>
@@ -22,6 +23,7 @@
 
 #include "schedulexmlparser.h"
 #include "sqlengine.h"
+#include "../gui/errormessage.h"
 
 #include <QDebug>
 
@@ -30,21 +32,29 @@ ScheduleXmlParser::ScheduleXmlParser(QObject *aParent)
 {
 }
 
-int ScheduleXmlParser::parseData(const QByteArray &aData)
+void ScheduleXmlParser::parseData(const QByteArray &aData, const QString& url)
 {
     QDomDocument document;
-    document.setContent (aData, false);
+    QString xml_error;
+    int xml_error_line;
+    int xml_error_column;
+    if (!document.setContent (aData, false, &xml_error, &xml_error_line, &xml_error_column)) {
+        error_message("Could not parse schedule: " + xml_error + " at line " + QString("%1").arg(xml_error_line) + " column " + QString("%1").arg(xml_error_column));
+        return;
+    }
 
     QDomElement scheduleElement = document.firstChildElement("schedule");
 
     SqlEngine::beginTransaction();
 
     int confId = 0;
+    QString conference_title;
     if (!scheduleElement.isNull())
     {
         QDomElement conferenceElement = scheduleElement.firstChildElement("conference");
         if (!conferenceElement.isNull())
         {
+            emit(parsingScheduleBegin());
             QHash<QString,QString> conference;
             conference["id"] = QString::number(0); // conference ID is assigned automatically, or obtained from the DB
             conference["title"] = conferenceElement.firstChildElement("title").text();
@@ -56,9 +66,10 @@ int ScheduleXmlParser::parseData(const QByteArray &aData)
             conference["days"] = conferenceElement.firstChildElement("days").text(); // int
             conference["day_change"] = conferenceElement.firstChildElement("day_change").text(); // time
             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time
+            conference["url"] = url;
             SqlEngine::addConferenceToDB(conference);
             confId = conference["id"].toInt();
-            emit(parsingSchedule(conference["title"]));
+            conference_title = conference["title"];
         }
 
         // we need to get count of all events in order to emit 'progressStatus' signal
@@ -94,7 +105,6 @@ int ScheduleXmlParser::parseData(const QByteArray &aData)
                         room["name"] = roomElement.attribute("name");
                         room["event_id"] = eventElement.attribute("id");
                         room["conference_id"] = QString::number(confId,10);
-                        room["picture"] = "NOT DEFINED YET"; // TODO: implement some mapping to assign correct picture to specified room_name
                         SqlEngine::addRoomToDB(room);
 
                         // process event's nodes
@@ -147,7 +157,10 @@ int ScheduleXmlParser::parseData(const QByteArray &aData)
         } // parsing day elements
     } // schedule element
     SqlEngine::commitTransaction();
-
-    return confId;
+    if (!conference_title.isNull()) {
+        emit parsingScheduleEnd(conference_title);
+    } else {
+        error_message("Could not parse schedule");
+    }
 }