Changeset 9d8946b for src/mvc

Timestamp:

01/21/10 15:12:57 (13 years ago)

Author:

timkoma <timkoma@…>

Branches:

master, qt5

Children:

e493054

Parents:

6a807e7

Message:

update for the search

Location:

src/mvc

Files:

• event.cpp (modified) (1 diff)
• eventmodel.cpp (modified) (2 diffs)
• eventmodel.h (modified) (1 diff)

src/mvc/event.cpp

@@ -22 +22 @@
 Event Event::getById(int id, int conferenceId)
 {
-
     QSqlQuery query;
     query.prepare(selectQuery() + "WHERE id = :id AND xid_conference = :conf");

src/mvc/eventmodel.cpp

@@ -185 +185 @@
 }
 
-void EventModel::loadSearchResultEvents(const QDate &aDate, int aConferenceId)
+int EventModel::loadSearchResultEvents(const QDate &aDate, int aConferenceId)
 {
     clearModel();
@@ -192 +192 @@
     {
         qDebug() << "Loading search result Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;
-        mEvents = Event::getSearchResultByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start");
-    }
+        try{
+            mEvents = Event::getSearchResultByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start");
+        }
+        catch( OrmException &e  ){
+            qDebug() << "Event::getSearchResultByDate failed: " << e.text();
+        }
+        catch(...){
+            qDebug() << "Event::getSearchResultByDate failed";
+        }
+
+    }
+
     createTimeGroups();
+
+    return mEvents.count();
 }
 

src/mvc/eventmodel.h

@@ -20 +20 @@
     void loadFavEvents(const QDate &aDate, int aConferenceId); // loads Favourite events from the DB
     void loadEventsByTrack(const QDate &aDate, int aConferenceId); // loads Events grouped by Track from the DB
-    void loadSearchResultEvents(const QDate &aDate, int aConferenceId);
+    int loadSearchResultEvents(const QDate &aDate, int aConferenceId);
     // a method to force 'EventModel' emit signal 'dataChanged()'
     // a 'view', eg. 'TreeView' listens for this signal and redraws changed items(indexes)