Stale events are deleted now after reloading conference.

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

diff --git a/src/sql/schedulexmlparser.cpp b/src/sql/schedulexmlparser.cpp
index 6f5e5086c68788a975372c8afdeb93fc48eaa099..f758727659a8f8058371fafc8f50a107c0eaecf5 100644 (file)
--- a/src/sql/schedulexmlparser.cpp
+++ b/src/sql/schedulexmlparser.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2021 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -66,10 +66,10 @@ void ScheduleXmlParser::parseDataImpl(const QByteArray &aData, const QString& ur
     {
         QDomElement conferenceElement = scheduleElement.firstChildElement("conference");
         QTime conference_day_change;
+        QHash<QString,QString> conference;
         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();
@@ -81,8 +81,10 @@ 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
+            conference["utc_offset"] = QString();
+            conference["display_time_shift"] = QString();
             conference["url"] = url;
-            sqlEngine->addConferenceToDB(conference, conferenceId);
+            sqlEngine->addConferenceToDB(conference, conferenceId, conferenceId != 0);
             conferenceId = conference["id"].toInt();
             conference_title = conference["title"];
             conference_day_change = QTime(0, 0).addSecs(conference["day_change"].toInt());
@@ -91,6 +93,10 @@ void ScheduleXmlParser::parseDataImpl(const QByteArray &aData, const QString& ur
         // we need to get count of all events in order to emit 'progressStatus' signal
         int totalEventsCount = scheduleElement.elementsByTagName("event").count();
 
+        // collect all event IDs so that we can identify previously existing events that were deleted
+        // when refreshing the conference
+        QSet<QString> importedEventIds;
+
         // parsing day elements
         int currentEvent = 0; // hold global idx of processed event
         QDomNodeList dayList = scheduleElement.elementsByTagName("day");
@@ -126,6 +132,7 @@ void ScheduleXmlParser::parseDataImpl(const QByteArray &aData, const QString& ur
                         // process event's nodes
                         QHash<QString,QString> event;
                         event["id"] = eventElement.attribute("id");
+                        importedEventIds.insert(event["id"]);
                         event["conference_id"] = QString::number(conferenceId, 10);
                         QTime event_start = QTime::fromString(eventElement.firstChildElement("start").text(), sqlEngine->TIME_FORMAT);
                         event["start"] = event_start.toString(sqlEngine->TIME_FORMAT); // time eg. 10:00
@@ -133,9 +140,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
-                            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 {
-                            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
@@ -180,6 +194,15 @@ void ScheduleXmlParser::parseDataImpl(const QByteArray &aData, const QString& ur
                 }
             } // parsing room elements
         } // parsing day elements
+
+        // Delete events that exist from a previous import but have not been imported again
+        sqlEngine->deleteStaleEvents(conferenceId, importedEventIds);
+
+        // Re-write conference as utc_offset was not known previously
+        if (!conference.value("utc_offset").isEmpty()) {
+            sqlEngine->addConferenceToDB(conference, conferenceId, conferenceId != 0);
+        }
+
     } // schedule element
     if (conference_title.isNull()) throw ParseException("Could not parse schedule");