Changeset 763b877

Timestamp:

08/18/21 21:17:28 (18 months ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master

Children:

a59d5c4

Parents:

ff579df

Message:

Fix bug: display_time_shift was lost when conference was reloaded.

Location:

src/sql

Files:

• schedulexmlparser.cpp (modified) (2 diffs)
• sqlengine.cpp (modified) (3 diffs)
• sqlengine.h (modified) (1 diff)

src/sql/schedulexmlparser.cpp

@@ -85 +85 @@
             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"];
@@ -193 +193 @@
         // 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);
         }
 

src/sql/sqlengine.cpp

@@ -145 +145 @@
 
 
-void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference, int conferenceId) {
+void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference, int conferenceId, bool omit_display_time_shift) {
     QSqlQuery query(db);
     bool insert = conferenceId <= 0;
@@ -154 +154 @@
                                                 ":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,"
-                                            "day_change=:day_change, timeslot_duration=:timeslot_duration, utc_offset=:utc_offset, display_time_shift=:display_time_shift, active=:active "
-                      "WHERE id=:id");
+        QString update = "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, utc_offset=:utc_offset";
+        if (!omit_display_time_shift) update += ", display_time_shift=:display_time_shift";
+        update += ", active=:active WHERE id=:id";
+        query.prepare(update);
     }
     foreach (QString prop_name, (QList<QString>() << "title" << "url" << "subtitle" << "venue" << "city")) {
@@ -169 +171 @@
     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);
+    if (!omit_display_time_shift) {
+        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);

src/sql/sqlengine.h

@@ -60 +60 @@
         bool applySqlFile(const QString sqlFile);
 
-        // if a conferneceId != 0 is given, the confernce is updated instead of inserted.
-        void addConferenceToDB(QHash<QString,QString> &aConference, int conferenceId);
+        // if a conferenceId != 0 is given, the conference is updated instead of inserted.
+        void addConferenceToDB(QHash<QString,QString> &aConference, int conferenceId, bool omit_display_time_shift = false);
         void addEventToDB(QHash<QString,QString> &aEvent);
         void addPersonToDB(QHash<QString,QString> &aPerson);