Parse and store utc_offset.

diff --git a/src/sql/schedulexmlparser.cpp b/src/sql/schedulexmlparser.cpp
index 6f5e5086c68788a975372c8afdeb93fc48eaa099..c17ba92ebbf364c215b5d9ccc44a15bafc5787aa 100644 (file)
--- a/src/sql/schedulexmlparser.cpp
+++ b/src/sql/schedulexmlparser.cpp
@@ -66,10 +66,10 @@ void ScheduleXmlParser::parseDataImpl(const QByteArray &aData, const QString& ur
     {
         QDomElement conferenceElement = scheduleElement.firstChildElement("conference");
         QTime conference_day_change;
     {
         QDomElement conferenceElement = scheduleElement.firstChildElement("conference");
         QTime conference_day_change;

+        QHash<QString,QString> conference;

         if (!conferenceElement.isNull())
         {
             emit(parsingScheduleBegin());
         if (!conferenceElement.isNull())
         {
             emit(parsingScheduleBegin());

-            QHash<QString,QString> conference;

             conference["id"] = QString::number(conferenceId); // conference ID is assigned automatically if 0
             conference["title"] = conferenceElement.firstChildElement("title").text();
             conference["subtitle"] = conferenceElement.firstChildElement("subtitle").text();
             conference["id"] = QString::number(conferenceId); // conference ID is assigned automatically if 0
             conference["title"] = conferenceElement.firstChildElement("title").text();
             conference["subtitle"] = conferenceElement.firstChildElement("subtitle").text();


@@ -81,6 +81,8 @@ void ScheduleXmlParser::parseDataImpl(const QByteArray &aData, const QString& ur
             if (conferenceDayChangeStr.isEmpty()) conferenceDayChangeStr = "04:00:00";
             conference["day_change"] = conferenceDayChangeStr;
             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time
             if (conferenceDayChangeStr.isEmpty()) conferenceDayChangeStr = "04:00:00";
             conference["day_change"] = conferenceDayChangeStr;
             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time

+            conference["utc_offset"] = QString();
+            conference["display_time_shift"] = QString();

             conference["url"] = url;
             sqlEngine->addConferenceToDB(conference, conferenceId);
             conferenceId = conference["id"].toInt();
             conference["url"] = url;
             sqlEngine->addConferenceToDB(conference, conferenceId);
             conferenceId = conference["id"].toInt();


@@ -133,9 +135,16 @@ void ScheduleXmlParser::parseDataImpl(const QByteArray &aData, const QString& ur
                         QDomElement eventDateElement = eventElement.firstChildElement("date");
                         if (!eventDateElement.isNull()) {
                             QString date_str = eventDateElement.text(); // date eg. 2009-02-07T10:00:00+00:00
                         QDomElement eventDateElement = eventElement.firstChildElement("date");
                         if (!eventDateElement.isNull()) {
                             QString date_str = eventDateElement.text(); // date eg. 2009-02-07T10:00:00+00:00

-                            event_date = QDate::fromString(date_str.left(sqlEngine->DATE_FORMAT.size()), sqlEngine->DATE_FORMAT);
+                            QDateTime event_date_time = QDateTime::fromString(date_str, Qt::ISODate);
+                            if (conference.value("utc_offset").isEmpty()) {
+                                QDateTime utc_event_date_time = event_date_time;
+                                utc_event_date_time.setTimeSpec(Qt::UTC);
+                                int conference_utc_offset = event_date_time.secsTo(utc_event_date_time);
+                                conference["utc_offset"] = QString::number(conference_utc_offset);
+                            }
+                            event_date = event_date_time.date();

                         } else {
                         } else {

-                            event_date = QDate::fromString(dayElement.attribute("date"),sqlEngine->DATE_FORMAT); // date eg. 2009-02-07
+                            event_date = QDate::fromString(dayElement.attribute("date"), Qt::ISODate); // date eg. 2009-02-07

                             if (event_start < conference_day_change) event_date = event_date.addDays(1);
                         }
                         event["date"] = event_date.toString(sqlEngine->DATE_FORMAT); // date eg. 2009-02-07
                             if (event_start < conference_day_change) event_date = event_date.addDays(1);
                         }
                         event["date"] = event_date.toString(sqlEngine->DATE_FORMAT); // date eg. 2009-02-07


@@ -180,6 +189,12 @@ void ScheduleXmlParser::parseDataImpl(const QByteArray &aData, const QString& ur
                 }
             } // parsing room elements
         } // parsing day elements
                 }
             } // parsing room elements
         } // parsing day elements

+
+        // Re-write conference as utc_offset was not known previously
+        if (!conference.value("utc_offset").isEmpty()) {
+            sqlEngine->addConferenceToDB(conference, conferenceId);
+        }
+

     } // schedule element
     if (conference_title.isNull()) throw ParseException("Could not parse schedule");
 
     } // schedule element
     if (conference_title.isNull()) throw ParseException("Could not parse schedule");
 

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index ae4a0164ac1f9d2f94ba10b766fa9f02ad5b7e79..edb70f81f6c9a0b986598c6551d6fef573ef7ac9 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -149,12 +149,12 @@ void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference, int confe
     bool insert = conferenceId <= 0;
     if (insert) { // insert conference
         query.prepare("INSERT INTO CONFERENCE (title,url,subtitle,venue,city,start,end,"
     bool insert = conferenceId <= 0;
     if (insert) { // insert conference
         query.prepare("INSERT INTO CONFERENCE (title,url,subtitle,venue,city,start,end,"

-                                                "day_change,timeslot_duration,active) "
+                                                "day_change,timeslot_duration,utc_offset,display_time_shift,active) "

                         " VALUES (:title,:url,:subtitle,:venue,:city,:start,:end,"
                         " VALUES (:title,:url,:subtitle,:venue,:city,:start,:end,"

-                                                ":day_change,:timeslot_duration,:active)");
+                                                ":day_change,:timeslot_duration,:utc_offset,:display_time_shift,:active)");

     } else { // update conference
         query.prepare("UPDATE CONFERENCE set title=:title, url=:url, subtitle=:subtitle, venue=:venue, city=:city, start=:start, end=:end,"
     } else { // update conference
         query.prepare("UPDATE CONFERENCE set title=:title, url=:url, subtitle=:subtitle, venue=:venue, city=:city, start=:start, end=:end,"

-                                            "day_change=:day_change, timeslot_duration=:timeslot_duration, active=:active "
+                                            "day_change=:day_change, timeslot_duration=:timeslot_duration, utc_offset=:utc_offset, display_time_shift=:display_time_shift, active=:active "

                       "WHERE id=:id");
     }
     foreach (QString prop_name, (QList<QString>() << "title" << "url" << "subtitle" << "venue" << "city")) {
                       "WHERE id=:id");
     }
     foreach (QString prop_name, (QList<QString>() << "title" << "url" << "subtitle" << "venue" << "city")) {


@@ -165,6 +165,12 @@ void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference, int confe
     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)));
     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)));

+    QVariant utc_offset;
+    if (!aConference.value("utc_offset").isEmpty()) utc_offset = aConference["utc_offset"].toInt();
+    query.bindValue(":utc_offset", utc_offset);
+    QVariant display_time_shift;
+    if (!aConference.value("display_time_shift").isEmpty()) display_time_shift = aConference["display_time_shift"].toInt();
+    query.bindValue(":display_time_shift", display_time_shift);

     query.bindValue(":active", 1);
     if (!insert) query.bindValue(":id", conferenceId);
     query.exec();
     query.bindValue(":active", 1);
     if (!insert) query.bindValue(":id", conferenceId);
     query.exec();