Changeset 72cd3af for src/sql

Timestamp:

01/21/10 13:54:58 (12 years ago)

Author:

korrco <korrco@…>

Branches:

master, qt5

Children:

606c155

Parents:

e662750

Message:

activities tab implemented

Location:

src/sql

Files:

• schedulexmlparser.cpp (modified) (2 diffs)
• sql.pro (modified) (1 diff)
• sqlengine.cpp (modified) (4 diffs)

src/sql/schedulexmlparser.cpp

@@ -82 +82 @@
                         // process event's nodes
                         QHash<QString,QString> event;
-                        event["id"] = eventElement.attribute("id");
-                        event["conference_id"] = QString::number(conferenceID,10);
+                        event["id"] = eventElement.attribute("id");;
+                        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
@@ -97 +97 @@
                         event["description"] = eventElement.firstChildElement("description").text(); // string
                         aDBEngine->addEventToDB(event);
-
                         // process persons' nodes
                         QList<QString> persons;
                         QDomElement personsElement = eventElement.firstChildElement("persons");
                         QDomNodeList personList = personsElement.elementsByTagName("person");
-                        for (int i=0; i<personList.count(); i++)
-                        {
+                        for(int i = 0;i < personList.count();i++){
                             QHash<QString,QString> person;
                             person["id"] = personList.at(i).toElement().attribute("id");
                             person["name"] = personList.at(i).toElement().text();
                             person["event_id"] = eventElement.attribute("id");
-                            person["conference_id"] = QString::number(conferenceID,10);
+                            person["conference_id"] = QString::number(conferenceID, 10);
                             //qDebug() << "adding Person: " << person["name"];
                             aDBEngine->addPersonToDB(person);
                         }
-
                         // process links' nodes
                         QDomElement linksElement = eventElement.firstChildElement("links");
                         QDomNodeList linkList = linksElement.elementsByTagName("link");
-                        for (int i=0; i<linkList.count(); i++)
-                        {
+                        for(int i = 0;i < linkList.count();i++){
                             QHash<QString,QString> link;
                             link["name"] = linkList.at(i).toElement().text();
                             link["url"] = linkList.at(i).toElement().attribute("href");
                             link["event_id"] = eventElement.attribute("id");
-                            link["conference_id"] = QString::number(conferenceID,10);
+                            link["conference_id"] = QString::number(conferenceID, 10);
                             aDBEngine->addLinkToDB(link);
                         }
-
                         // emit signal to inform the user about the current status (how many events are parsed so far - expressed in %)
-                        int status=currentEvent*100/totalEventsCount;
-                        emit progressStatus(status);
+                        int status = currentEvent * 100 / totalEventsCount;
+                        progressStatus(status);
                     } // parsing event elements
                 }

src/sql/sql.pro

@@ -7 +7 @@
 
 # module dependencies
+LIBS += -L$$DESTDIR -lmvc -lorm
+INCLUDEPATH += ../mvc ../orm
 DEPENDPATH += .
 

src/sql/sqlengine.cpp

@@ -8 +8 @@
 #include <QDir>
 #include "sqlengine.h"
+#include <track.h>
 
 #include <QDebug>
@@ -89 +90 @@
     if (db.isValid() && db.isOpen())
     {
-        // track has to be handled as the first, since it is necessary to get
-        // track ID from the TRACK table, or to create new TRACK record
-        // and get the ID from newly created record
-        QString queryExist = QString("SELECT id FROM track WHERE name='%1'").arg(aEvent["track"]);
-        QSqlQuery resultExist(queryExist,db);
-        // now we have to check whether TRACK record with 'name' exists or not,
-        // - if it doesn't exist yet, then we have to add that record to 'TRACK' table
-        // - if it exists, then we need to get its 'id'
-        int actId = -1;
-        if(resultExist.next()) // TRACK record with 'name' already exists: we need to get its 'id'
+        //insert event track to table
+        QString name = aEvent["track"];
+        Track track;
+        int trackId;
+        try
         {
-            actId = resultExist.value(0).toInt();
+            track = Track::retrieveByName(name);
+            trackId = track.id();
+            /*qDebug() << QString("DEBUG: Track %1 in DB").arg(name);*/
         }
-        else // TRACK record doesn't exist yet, need to create it
-        {
-            QString values = QString("'%1'").arg(aEvent["track"]);
-            QString query = QString("INSERT INTO track (name) VALUES (%1)").arg(values);
-            QSqlQuery result (query, db);
-            actId = result.lastInsertId().toInt(); // 'id' is assigned automatically
+        catch (OrmNoObjectException &e) {
+            track.setName(name);
+            trackId = track.insert();
+            /*qDebug() << QString("DEBUG: Track %1 added to DB").arg(name);*/
         }
-
         // The items of the Event are divided into the two tables EVENT and VIRTUAL_EVENT
         // VIRTUAL_EVENT is for Full-Text-Serach Support
@@ -118 +113 @@
                          .arg(QString::number(startDateTime.toTime_t())) \
                          .arg(-QTime::fromString(aEvent["duration"],TIME_FORMAT).secsTo(QTime(0,0))) \
-                         .arg(QString::number(actId)) \
+                         .arg(trackId) \
                          .arg(aEvent["type"]) \
                          .arg(aEvent["language"]) \
@@ -236 +231 @@
         query.exec("CREATE TABLE TRACK ( \
             id INTEGER  PRIMARY KEY AUTOINCREMENT  NOT NULL , \
-            name VARCHAR NOT NULL )");
+            name VARCHAR UNIQUE NOT NULL )");
 
         query.exec("CREATE TABLE ROOM ( \