Changeset 5d9409d for src

Timestamp:

03/03/10 16:47:00 (13 years ago)

Author:

timkoma <timkoma@…>

Branches:

master, qt5

Children:

5bd6aba

Parents:

7270ae0

Message:

UTC/LocalTime fix for import conference XML, DB queries for multiple conferences fixes

Location:

src

Files:

• alarm/alarm.cpp (modified) (1 diff)
• mvc/event.cpp (modified) (2 diffs)
• sql/sqlengine.cpp (modified) (3 diffs)

src/alarm/alarm.cpp

@@ -48 +48 @@
     local.setTimeSpec(Qt::LocalTime);
     qDebug() << "LocalTime: " << local.toTime_t();
-    
+
     eve->alarm_time = local.toTime_t();
     eve->flags = ALARM_EVENT_BOOT;

src/mvc/event.cpp

@@ -144 +144 @@
     {
         QSqlQuery query;
-        query.prepare("SELECT xid_room FROM event_room WHERE xid_event = :id");
+        query.prepare("SELECT xid_room FROM event_room WHERE xid_event = :id AND xid_conference = :conf");
         query.bindValue(":id", id());
+        query.bindValue(":conf", conferenceId());
         if (!query.isActive())
             if (!query.exec())
@@ -165 +166 @@
         QSqlQuery query;
         // TODO: conference ID isn't used here
-        query.prepare("SELECT person.name FROM person INNER JOIN event_person ON person.id = event_person.xid_person AND event_person.xid_event = :id");
+        query.prepare("SELECT person.name FROM person INNER JOIN event_person ON person.id = event_person.xid_person AND event_person.xid_event = :id AND event_person.xid_conference = :conf");
         query.bindValue(":id", id());
+        query.bindValue(":conf", conferenceId());
         query.exec();
         // TODO: handle qeury error

src/sql/sqlengine.cpp

@@ -153 +153 @@
             /*qDebug() << QString("DEBUG: Track %1 added to DB").arg(name);*/
         }
-        QDateTime startDateTime = QDateTime(QDate::fromString(aEvent["date"],DATE_FORMAT),QTime::fromString(aEvent["start"],TIME_FORMAT));
+        QDateTime startDateTime;
+        startDateTime.setTimeSpec(Qt::UTC);
+        startDateTime = QDateTime(QDate::fromString(aEvent["date"],DATE_FORMAT),QTime::fromString(aEvent["start"],TIME_FORMAT),Qt::UTC);
+        qDebug() << "startDateTime: " << startDateTime.toString();
         QString values = QString("'%1', '%2', '%3', '%4', '%5', '%6', '%7', ? , ? , ? , ? , ? , '%8', '%9'") \
                          .arg(aEvent["conference_id"]) \
@@ -169 +172 @@
             .arg(values);
 
+        qDebug() << query;
         QSqlQuery result;
         result.prepare(query);
@@ -369 +373 @@
     execQuery( db, query );
 
-    //TODO: retun number of rows from SEARCH_EVENT
     return 1;
 }