Merge lp:~renatofilho/qtorganizer5-eds/fix-match-all into lp:~ubuntu-sdk-team/qtorganizer5-eds/trunk

[Renato Araujo Oliveira Filho]

Used a proper match all query string.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:17
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-saucy-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-saucy-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-saucy-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-saucy-i386-ci/13

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/qtorganizer5-eds-ci/13/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

I haven’t actually verified that this fixes bug #1236390, however the code looks sound to me.

review: Approve

[David Planella (dpm)]

In order to make testing easier, there are now packages available containing this change in the core apps PPA:

https://code.launchpad.net/~ubuntu-touch-coreapps-drivers/+archive/daily/+packages?field.name_filter=organizer&field.status_filter=published&field.series_filter=saucy

[Nekhelesh Ramananthan (nik90)]

This does not fix bug #1236390. I installed the PPA and installed the qtorganizer5-eds package and on running the clock app through the qtcreator, the alarms are not saved. Console output log can be found at http://paste.ubuntu.com/6240020/

I did also test the clock app installed on the phone (click app), and still didnnt notice any alarms being saved (Image 97).

[Nekhelesh Ramananthan (nik90)]

Okay so on testing the armhf deb package that I downloaded from this MP at http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-saucy-armhf-ci/13, alarms can now be saved properly :) .. Approving!

review: Approve

=== modified file 'qorganizer/qorganizer-eds-fetchrequestdata.cpp'
--- qorganizer/qorganizer-eds-fetchrequestdata.cpp	2013-10-05 22:39:01 +0000
+++ qorganizer/qorganizer-eds-fetchrequestdata.cpp	2013-10-15 01:16:52 +0000
@@ -59,14 +59,17 @@
     // TODO: emit changeset???
 }
 
-void FetchRequestData::appendResults(QList<QOrganizerItem> results)
+int FetchRequestData::appendResults(QList<QOrganizerItem> results)
 {
+    int count = 0;
     QOrganizerItemFetchRequest *req = request<QOrganizerItemFetchRequest>();
     Q_FOREACH(QOrganizerItem item, results) {
         if (QOrganizerManagerEngine::testFilter(req->filter(), item)) {
             m_results << item;
+            count++;
         }
     }
+    return count;
 }
 
 QString FetchRequestData::dateFilter()
@@ -74,17 +77,16 @@
     QDateTime startDate = request<QOrganizerItemFetchRequest>()->startDate();
     QDateTime endDate = request<QOrganizerItemFetchRequest>()->endDate();
 
-    if (!startDate.isValid()) {
-        startDate.setMSecsSinceEpoch(0);
+    if (!startDate.isValid() ||
+        !endDate.isValid()) {
+        return QStringLiteral("#t"); // match all
     }
 
-    if (!endDate.isValid()) {
-        endDate.setMSecsSinceEpoch(std::numeric_limits<qint64>::max());
-    }
 
     QString query = QString("(occur-in-time-range? "
                             "(make-time \"%1\") (make-time \"%2\"))")
             .arg(isodate_from_time_t(startDate.toTime_t()))
             .arg(isodate_from_time_t(endDate.toTime_t()));
+
     return query;
 }

=== modified file 'qorganizer/qorganizer-eds-fetchrequestdata.h'
--- qorganizer/qorganizer-eds-fetchrequestdata.h	2013-08-14 21:23:01 +0000
+++ qorganizer/qorganizer-eds-fetchrequestdata.h	2013-10-15 01:16:52 +0000
@@ -31,7 +31,7 @@
     QOrganizerEDSCollectionEngineId* collection() const;
 
     void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError);
-    void appendResults(QList<QtOrganizer::QOrganizerItem> results);
+    int appendResults(QList<QtOrganizer::QOrganizerItem> results);
     QString dateFilter();
 
 private:

=== modified file 'qorganizer/qorganizer-eds-viewwatcher.cpp'
--- qorganizer/qorganizer-eds-viewwatcher.cpp	2013-10-07 16:13:48 +0000
+++ qorganizer/qorganizer-eds-viewwatcher.cpp	2013-10-15 01:16:52 +0000
@@ -26,8 +26,6 @@
 
 using namespace QtOrganizer;
 
-QString ViewWatcher::m_dateFilter;
-
 ViewWatcher::ViewWatcher(QOrganizerEDSEngine *engine,
                          const QOrganizerCollectionId &collectionId,
                          QOrganizerEDSCollectionEngineId *edsId)
@@ -37,19 +35,6 @@
       m_eView(0),
       m_eventLoop(0)
 {
-    if (m_dateFilter.isEmpty()) {
-        QDateTime startDate;
-        startDate.setMSecsSinceEpoch(0);
-
-        QDateTime endDate;
-        endDate.setMSecsSinceEpoch(std::numeric_limits<qint64>::max());
-
-        m_dateFilter =  QString("(occur-in-time-range? "
-                                                     "(make-time \"%1\") (make-time \"%2\"))")
-                                                     .arg(isodate_from_time_t(startDate.toTime_t()))
-                                                     .arg(isodate_from_time_t(endDate.toTime_t()));
-
-    }
     m_cancellable = g_cancellable_new();
     e_cal_client_connect(m_edsId->m_esource,
                          m_edsId->m_sourceType,
@@ -79,7 +64,7 @@
         }
     } else {
         e_cal_client_get_view(self->m_eClient,
-                              self->m_dateFilter.toUtf8().data(),
+                              QStringLiteral("#t").toUtf8().constData(), // match all,
                               self->m_cancellable,
                               (GAsyncReadyCallback) ViewWatcher::viewReady,
                               self);

=== modified file 'qorganizer/qorganizer-eds-viewwatcher.h'
--- qorganizer/qorganizer-eds-viewwatcher.h	2013-10-06 23:04:20 +0000
+++ qorganizer/qorganizer-eds-viewwatcher.h	2013-10-15 01:16:52 +0000
@@ -50,8 +50,6 @@
     ECalClientView *m_eView;
     QEventLoop *m_eventLoop;
 
-    static QString m_dateFilter;
-
     static void clientConnected(GObject *sourceObject, GAsyncResult *res, ViewWatcher *self);
     static void viewReady(GObject *sourceObject, GAsyncResult *res, ViewWatcher *self);