Changeset 27102d5

Timestamp:

01/18/10 10:22:57 (12 years ago)

Author:

fortefr <fortefr@…>

Branches:

master, qt5

Children:

8f25cb1

Parents:

8035cef

Message:

Temporal virtual_event change

Location:

src

Files:

• mvc/event.cpp (modified) (1 diff)
• mvc/event.h (modified) (1 diff)
• mvc/eventmodel.cpp (modified) (1 diff)
• orm/ormrecord.h (modified) (1 diff)
• sql/sqlengine.cpp (modified) (4 diffs)

src/mvc/event.cpp

@@ -65 +65 @@
 }
 
+

src/mvc/event.h

@@ -27 +27 @@
 public:
     static Event getById(int id, int conferenceId);
+    static Event getVirtualById(int id, int conferenceId);
     static QList<Event> getByDate(const QDate& date, int conferenceId);
     static QList<Event> getFavByDate(const QDate& date, int conferenceId); // get Favourities by Date

src/mvc/eventmodel.cpp

@@ -48 +48 @@
     {
         if (index.internalId() == 0)
-        {
+        {   //range of time data
+            //qDebug() << qVariantValue<QString>(mGroups.at(index.row()).mTitle);
             return mGroups.at(index.row()).mTitle;
         }
-        else
+        else //event data
         {
+            //qDebug() << qVariantValue<QString>(static_cast<Event*>(index.internalPointer())->id());
+            //return static_cast<Event*>(index.internalPointer())->id();
+            //qDebug() << Event::getVirtualById(static_cast<Event*>(index.internalPointer())->id(), 1).title();// Id Conference is 1 by now
+            //return 1;
             return static_cast<Event*>(index.internalPointer())->id();
         }

src/orm/ormrecord.h

@@ -189 +189 @@
 }
 
+
 template <typename T>
 QString OrmRecord<T>::selectQueryJoin2T(const QString &key)

src/sql/sqlengine.cpp

@@ -52 +52 @@
         QDir::home().mkdir(".fosdem");
     databaseName = QDir::homePath() + "/.fosdem/" + "fosdem.sqlite";
-
+qDebug()<<databaseName;
     login("QSQLITE",databaseName);
 }
@@ -120 +120 @@
     }
 }
+
 
 void SqlEngine::addPersonToDB(QHash<QString,QString> &aPerson)
@@ -233 +234 @@
             FOREIGN KEY(xid_activity) REFERENCES ACTIVITY(id))");
 
-        query.exec("CREATE VIRTUAL TABLE VIRTUAL_EVENT using fts3 ( \
+        // TBD Virtual tables compatibility (waiting for Marek). Temporary non virtual VIRTUAL_TABLE below: To be deleted
+/*        query.exec("CREATE VIRTUAL TABLE VIRTUAL_EVENT using fts3 ( \
             xid_conference INTEGER  NOT NULL, \
             id INTEGER NOT NULL , \
@@ -241 +243 @@
             description VARCHAR, \
             PRIMARY KEY (xid_conference,id))");
+*/
+        query.exec("CREATE TABLE VIRTUAL_EVENT ( \
+            xid_conference INTEGER  NOT NULL, \
+            id INTEGER NOT NULL , \
+            tag VARCHAR,title VARCHAR NOT NULL , \
+            subtitle VARCHAR, \
+            abstract VARCHAR, \
+            description VARCHAR, \
+            PRIMARY KEY (xid_conference,id))");
 
         query.exec("CREATE TABLE EVENT_PERSON ( \