search update

[toast/confclerk.git] / src / mvc / event.cpp

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index 18b6e33af49631eb52670ca21e9857f47c4e472f..2685fb4cd84140d5f09a0a0210ab7ef9980fa411 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -1,29 +1,17 @@
 #include "event.h"
 
-// 'event' record is splitted into two separate tables 'event' and 'virtual_event'
-// for the FTS (Full-Text-Search) support and so, it is necessary to provide/use
-// two table names + corresponding parameters/methods, see bellow
-QString const Event::sTable1Name = QString("event");
-QString const Event::sTable2Name = QString("virtual_event");
-int const Event::sTable1ColCount = 9; // see 'toRecord()' for more details
-int const Event::sTable2ColCount = 5; // see 'toRecord()' for more details
-const QString Event::XID_ACTIVITY = "xid_activity";
-const QString Event::START = "start";
-
-
+QString const Event::sTableName = QString("event");
 
 QSqlRecord const Event::sColumns = Event::toRecord(QList<QSqlField>()
-    /* 'columns from Table 1 */
     << QSqlField("id", QVariant::Int)
     << QSqlField("xid_conference", QVariant::Int)
     << QSqlField("start", QVariant::DateTime)
     << QSqlField("duration", QVariant::Int)
-    << QSqlField("xid_activity", QVariant::Int)
+    << QSqlField("xid_track", QVariant::Int)
     << QSqlField("type", QVariant::String)
     << QSqlField("language", QVariant::String)
     << QSqlField("favourite", QVariant::Bool)
     << QSqlField("alarm", QVariant::Bool)
-    /* 'columns' from Table2 */
     << QSqlField("tag", QVariant::String)
     << QSqlField("title", QVariant::String)
     << QSqlField("subtitle", QVariant::String)
@@ -34,21 +22,16 @@ QSqlRecord const Event::sColumns = Event::toRecord(QList<QSqlField>()
 Event Event::getById(int id, int conferenceId)
 {
     QSqlQuery query;
-    query.prepare(
-            selectQueryJoin2T("id")
-            + QString("WHERE %1.id = :id AND %1.xid_conference = :conf").arg(sTable1Name));
+    query.prepare(selectQuery() + "WHERE id = :id AND xid_conference = :conf");
     query.bindValue(":id", id);
     query.bindValue(":conf", conferenceId);
-
     return loadOne(query);
 }
 
 QList<Event> Event::getByDate(const QDate& date, int conferenceId, QString orderBy)
 {
     QSqlQuery query;
-    query.prepare(
-            selectQueryJoin2T("id")
-            + QString("WHERE %1.xid_conference = :conf AND %1.start >= :start AND %1.start < :end ORDER BY %1.%2").arg(sTable1Name).arg(orderBy));
+    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start >= :start AND start < :end ORDER BY %1").arg(orderBy));
     query.bindValue(":conf", conferenceId);
     query.bindValue(":start", convertToDb(date, QVariant::DateTime));
     query.bindValue(":end", convertToDb(date.addDays(1), QVariant::DateTime));
@@ -56,12 +39,24 @@ QList<Event> Event::getByDate(const QDate& date, int conferenceId, QString order
     return load(query);
 }
 
+QList<Event> Event::nowEvents(int conferenceId, QString orderBy)
+{
+    //uint curTime_t =  QDateTime(QDate::currentDate(),QTime::currentTime(),Qt::UTC).toTime_t();
+    uint curTime_t = 1265457610; // for testing
+
+    QSqlQuery query;
+    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start <= :now1 AND ( start + duration ) > :now2 ORDER BY %1").arg(orderBy));
+    query.bindValue(":conf", conferenceId);
+    query.bindValue(":now1", convertToDb(curTime_t, QVariant::DateTime));
+    query.bindValue(":now2", convertToDb(curTime_t, QVariant::DateTime));
+
+    return load(query);
+}
+
 QList<Event> Event::getFavByDate(const QDate& date, int conferenceId)
 {
     QSqlQuery query;
-    query.prepare(
-            selectQueryJoin2T("id")
-            + QString("WHERE %1.xid_conference = :conf AND %1.start >= :start AND %1.start < :end AND %1.favourite = 1 ORDER BY %1.start").arg(sTable1Name));
+    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start >= :start AND start < :end AND favourite = 1 ORDER BY start"));
     query.bindValue(":conf", conferenceId);
     query.bindValue(":start", convertToDb(date, QVariant::DateTime));
     query.bindValue(":end", convertToDb(date.addDays(1), QVariant::DateTime));
@@ -69,6 +64,15 @@ QList<Event> Event::getFavByDate(const QDate& date, int conferenceId)
     return load(query);
 }
 
+QList<Event> Event::getByTrack(int trackId)
+{
+    QSqlQuery query;
+    query.prepare(selectQuery() + QString("WHERE xid_track = :trackId ORDER BY start"));
+    query.bindValue(":trackId", trackId);
+
+    return load(query);
+}
+
 QString Event::room() const
 {
     QSqlQuery query;
@@ -117,3 +121,33 @@ void Event::setPersons(const QStringList &persons)
     // TODO: implement
 }
 
+QList<Event> Event::getSearchResultByDate(const QDate& date, int conferenceId, QString orderBy)
+{
+
+    QString strQuery = QString("SELECT %1 FROM EVENT INNER JOIN SEARCH_EVENT USING (xid_conference, id) ").arg(columnsForSelect());
+    strQuery += QString("WHERE xid_conference = :conf AND start >= :start AND start < :end ORDER BY %1").arg(orderBy);
+    qDebug() << strQuery;
+    QList<Event> list;
+    QSqlQuery query;
+    try{
+        if( !query.prepare( strQuery ) ){
+            qDebug() << "QSqlQuery.prepare error";
+            throw OrmSqlException( query.lastError().text() );
+        }
+
+        query.bindValue(":conf", conferenceId);
+        query.bindValue(":start", convertToDb(date, QVariant::DateTime));
+        query.bindValue(":end", convertToDb(date.addDays(1), QVariant::DateTime));
+
+        list = load(query);
+    }
+    catch(OrmException &e)
+    {
+        qDebug() << "getSearchResultByDate error: " << e.text();
+    }
+    catch(...){
+        qDebug() << "getSearchResultByDate failed ...";
+    }
+    return list;
+}
+