If no day_change was given for a conference 4 AM is assumed.

Fixes #53.

diff --git a/src/sql/schedulexmlparser.cpp b/src/sql/schedulexmlparser.cpp
index 7bf7ed62f84c910658429b65413d931b392158fd..056e0e14c44ac8a0007dc642439828e7bd10f55b 100644 (file)
--- a/src/sql/schedulexmlparser.cpp
+++ b/src/sql/schedulexmlparser.cpp
@@ -63,7 +63,9 @@ void ScheduleXmlParser::parseData(const QByteArray &aData, const QString& url, i
             conference["city"] = conferenceElement.firstChildElement("city").text();
             conference["start"] = conferenceElement.firstChildElement("start").text(); // date
             conference["end"] = conferenceElement.firstChildElement("end").text(); // date
             conference["city"] = conferenceElement.firstChildElement("city").text();
             conference["start"] = conferenceElement.firstChildElement("start").text(); // date
             conference["end"] = conferenceElement.firstChildElement("end").text(); // date

-            conference["day_change"] = conferenceElement.firstChildElement("day_change").text(); // time
+            QString conferenceDayChangeStr = conferenceElement.firstChildElement("day_change").text(); // time, e.g. "04:00:00"
+            if (conferenceDayChangeStr.isEmpty()) conferenceDayChangeStr = "04:00:00";
+            conference["day_change"] = conferenceDayChangeStr;

             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time
             conference["url"] = url;
             sqlEngine->addConferenceToDB(conference, conferenceId);
             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time
             conference["url"] = url;
             sqlEngine->addConferenceToDB(conference, conferenceId);

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index e062387c1398481985bec0fcb442ceb8bad7b89d..9998467488b0c06c6dd375a93e7ecae5cb3adee6 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -154,7 +154,8 @@ void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference, int confe
     }
     query.bindValue(":start", QDateTime(QDate::fromString(aConference["start"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t());
     query.bindValue(":end", QDateTime(QDate::fromString(aConference["end"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t());
     }
     query.bindValue(":start", QDateTime(QDate::fromString(aConference["start"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t());
     query.bindValue(":end", QDateTime(QDate::fromString(aConference["end"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t());

-    query.bindValue(":day_change", -QTime::fromString(aConference["day_change"],TIME_FORMAT).secsTo(QTime(0,0)));
+    QTime dayChange = QTime::fromString(aConference["day_change"].left(TIME_FORMAT.size()), TIME_FORMAT);
+    query.bindValue(":day_change", QTime(0, 0).secsTo(dayChange));

     query.bindValue(":timeslot_duration", -QTime::fromString(aConference["timeslot_duration"],TIME_FORMAT).secsTo(QTime(0,0)));
     query.bindValue(":active", 1);
     if (!insert) query.bindValue(":id", conferenceId);
     query.bindValue(":timeslot_duration", -QTime::fromString(aConference["timeslot_duration"],TIME_FORMAT).secsTo(QTime(0,0)));
     query.bindValue(":active", 1);
     if (!insert) query.bindValue(":id", conferenceId);