Temporal virtual_event change

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index df2035cab614f5ddd72ce9fdb8078e82ed63ce51..dbe43cf5a6bc20a2a7abac2a6a5d26a2dbbc3518 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -64,3 +64,4 @@ QList<Event> Event::getFavByDate(const QDate& date, int conferenceId)
     return load(query);
 }
 
+

diff --git a/src/mvc/event.h b/src/mvc/event.h
index b09daa8516eeb291e6c8996b79cafde7090c1577..2433016dacffef66daa9d05e5fc3fb455f7c04db 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -26,6 +26,7 @@ public:
 
 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
 

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index 25729de7eca06e43a059886767792f7bcc6bc971..650c37249f29731ca78a55e9906984d5d60d5032 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -47,11 +47,16 @@ QVariant EventModel::data(const QModelIndex& index, int role) const
     if (index.isValid() && role == Qt::DisplayRole)
     {
         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();
         }
     }

diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h
index d14b861a9eeeb2eb273e3d4f62e5106164337a72..35900758e29dcb273749fc84c9e7863d8f80d118 100644 (file)
--- a/src/orm/ormrecord.h
+++ b/src/orm/ormrecord.h
@@ -188,6 +188,7 @@ QString OrmRecord<T>::selectQuery()
     return QString("SELECT %1 FROM %2 ").arg(columnsForSelect(), T::sTableName);
 }
 
+
 template <typename T>
 QString OrmRecord<T>::selectQueryJoin2T(const QString &key)
 {

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 87c245cb555a0fc9add4180ee5ac710af25a8ee9..1eeff198048024fbe246b827d5cf777d09c7caac 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -51,7 +51,7 @@ void SqlEngine::initialize()
     if(!QDir::home().exists(".fosdem"))
         QDir::home().mkdir(".fosdem");
     databaseName = QDir::homePath() + "/.fosdem/" + "fosdem.sqlite";
-
+qDebug()<<databaseName;
     login("QSQLITE",databaseName);
 }
 
@@ -120,6 +120,7 @@ void SqlEngine::addEventToDB(QHash<QString,QString> &aEvent)
     }
 }
 
+
 void SqlEngine::addPersonToDB(QHash<QString,QString> &aPerson)
 {
     QSqlDatabase db = QSqlDatabase::database();
@@ -232,7 +233,17 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
             FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id) \
             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 , \
+            tag VARCHAR,title VARCHAR NOT NULL , \
+            subtitle VARCHAR, \
+            abstract VARCHAR, \
+            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 , \