Add .pro.user.* to svn:ignore and remove it in the release target.

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

diff --git a/src/sql/schedulexmlparser.cpp b/src/sql/schedulexmlparser.cpp
index bfea3a464d2b2b8321fa0d1f971c5b20c32125d1..6e361abbe57b70adb24c74febcdd7290fbad9874 100644 (file)
--- a/src/sql/schedulexmlparser.cpp
+++ b/src/sql/schedulexmlparser.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011 Philipp Spitzer, gregor herrmann
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -36,8 +36,10 @@ void ScheduleXmlParser::parseData(const QByteArray &aData, const QString& url)
 {
     QDomDocument document;
     QString xml_error;
-    if (!document.setContent (aData, false, &xml_error)) {
-        error_message("Could not parse schedule: " + 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;
     }
 
@@ -52,6 +54,7 @@ void ScheduleXmlParser::parseData(const QByteArray &aData, const QString& url)
         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();
@@ -67,7 +70,6 @@ void ScheduleXmlParser::parseData(const QByteArray &aData, const QString& url)
             SqlEngine::addConferenceToDB(conference);
             confId = conference["id"].toInt();
             conference_title = conference["title"];
-            emit(parsingScheduleBegin());
         }
 
         // we need to get count of all events in order to emit 'progressStatus' signal