Changeset 2dffed3 for src/sql/schedulexmlparser.cpp

Timestamp:

08/22/12 00:11:58 (10 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

7680536

Parents:

ca20842

Message:

On the way to fix #45.

File:

• src/sql/schedulexmlparser.cpp (modified) (9 diffs)

src/sql/schedulexmlparser.cpp

@@ -33 +33 @@
 }
 
-void ScheduleXmlParser::parseData(const QByteArray &aData, const QString& url)
+void ScheduleXmlParser::parseData(const QByteArray &aData, const QString& url, int conferenceId)
 {
     QDomDocument document;
@@ -48 +48 @@
     SqlEngine::beginTransaction();
 
-    int confId = 0;
     QString conference_title;
     if (!scheduleElement.isNull())
@@ -57 +56 @@
             emit(parsingScheduleBegin());
             QHash<QString,QString> conference;
-            conference["id"] = QString::number(0); // conference ID is assigned automatically, or obtained from the DB
+            conference["id"] = conferenceId; // conference ID is assigned automatically if 0
             conference["title"] = conferenceElement.firstChildElement("title").text();
             conference["subtitle"] = conferenceElement.firstChildElement("subtitle").text();
@@ -68 +67 @@
             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time
             conference["url"] = url;
-            SqlEngine::addConferenceToDB(conference);
-            confId = conference["id"].toInt();
+            SqlEngine::addConferenceToDB(conference, conferenceId);
+            conferenceId = conference["id"].toInt();
             conference_title = conference["title"];
         }
@@ -105 +104 @@
                         room["name"] = roomElement.attribute("name");
                         room["event_id"] = eventElement.attribute("id");
-                        room["conference_id"] = QString::number(confId,10);
+                        room["conference_id"] = QString::number(conferenceId,10);
                         SqlEngine::addRoomToDB(room);
 
@@ -111 +110 @@
                         QHash<QString,QString> event;
                         event["id"] = eventElement.attribute("id");;
-                        event["conference_id"] = QString::number(confId, 10);
+                        event["conference_id"] = QString::number(conferenceId, 10);
                         event["start"] = eventElement.firstChildElement("start").text(); // time eg. 10:00
                         event["date"] = dayElement.attribute("date"); // date eg. 2009-02-07
@@ -126 +125 @@
                         SqlEngine::addEventToDB(event);
                         // process persons' nodes
-                        QList<QString> persons;
                         QDomElement personsElement = eventElement.firstChildElement("persons");
                         QDomNodeList personList = personsElement.elementsByTagName("person");
@@ -134 +132 @@
                             person["name"] = personList.at(i).toElement().text();
                             person["event_id"] = eventElement.attribute("id");
-                            person["conference_id"] = QString::number(confId, 10);
-                            //qDebug() << "adding Person: " << person["name"];
+                            person["conference_id"] = QString::number(conferenceId, 10);
                             SqlEngine::addPersonToDB(person);
                         }
@@ -146 +143 @@
                             link["url"] = linkList.at(i).toElement().attribute("href");
                             link["event_id"] = eventElement.attribute("id");
-                            link["conference_id"] = QString::number(confId, 10);
+                            link["conference_id"] = QString::number(conferenceId, 10);
                             SqlEngine::addLinkToDB(link);
                         }