* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 39 insertions, 0 deletions

diff --git a/kresources/caldav/reader.cpp b/kresources/caldav/reader.cpp
index a7956fe62..892b490c6 100644
--- a/kresources/caldav/reader.cpp
+++ b/kresources/caldav/reader.cpp
@@ -38,6 +38,11 @@ void CalDavReader::cleanTasksJob() {
     mTasksData = "";
 }
 
+void CalDavReader::cleanJournalsJob() {
+    CalDavJob::cleanJob();
+    mJournalsData = "";
+}
+
 int CalDavReader::runJob(runtime_info* RT) {
     kdDebug() << "reader::run, url: " << url();
 
@@ -104,4 +109,38 @@ int CalDavReader::runTasksJob(runtime_info* RT) {
     return tasksres;
 }
 
+int CalDavReader::runJournalsJob(runtime_info* RT) {
+    kdDebug() << "reader::run, journalsUrl: " << journalsUrl();
+
+    response* result = caldav_get_response();
+    CALDAV_RESPONSE journalsres = OK;
+
+    if ((OK == journalsres) && (journalsUrl() != "")) {
+      kdDebug() << "reader::run, url: " << journalsUrl();
+
+      if (mGetAll) {
+          kdDebug() << "getting all objects";
+          journalsres = caldav_tasks_getall_object(result, std::string(journalsUrl().ascii()).c_str(), RT);
+      } else {
+          kdDebug() << "getting object from the specified time range";
+          journalsres = caldav_tasks_get_object(result, mTimeStart.toTime_t(), mTimeEnd.toTime_t(), std::string(journalsUrl().ascii()).c_str(), RT);
+      }
+
+      if (OK == journalsres) {
+          kdDebug() << "success";
+          if (result->msg) {
+              mJournalsData = result->msg;
+          } else {
+              kdDebug() << "empty collection";
+              // empty collection
+              mJournalsData = "";
+          }
+      }
+
+      caldav_free_response(&result);
+    }
+
+    return journalsres;
+}
+
 // EOF ========================================================================