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 c17ba92ebbf364c215b5d9ccc44a15bafc5787aa..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.
  *
@@ -84,7 +84,7 @@ void ScheduleXmlParser::parseDataImpl(const QByteArray &aData, const QString& ur
             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());
@@ -93,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");
@@ -128,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
@@ -190,9 +195,12 @@ 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);
+            sqlEngine->addConferenceToDB(conference, conferenceId, conferenceId != 0);
         }
 
     } // schedule element