From 73ea4bf3de3ead8ebf411851eac0a66a43481cd1 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Mon, 3 Jan 2011 17:13:01 +0100
Subject: [PATCH] Add the synchronize() method to queries. Add the cached list
 query.

---
 .../lib/Horde/Kolab/Storage/List/Query/Base.php    | 11 ++++++++++-
 .../lib/Horde/Kolab/Storage/Query.php              |  7 +++++++
 framework/Kolab_Storage/package.xml                | 22 +++++++++++++++++-----
 .../test/Horde/Kolab/Storage/Stub/FactoryQuery.php |  9 +++++++++
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Base.php
index f7b44eece..86093d56f 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Base.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Base.php
@@ -26,7 +26,7 @@
  * @link     http://pear.horde.org/index.php?package=Kolab_Storage
  */
 class Horde_Kolab_Storage_List_Query_Base
-implements Horde_Kolab_Storage_Query
+implements Horde_Kolab_Storage_List_Query
 {
     /**
      * The queriable list.
@@ -113,4 +113,13 @@ implements Horde_Kolab_Storage_Query
         }
         return $result;
     }
+
+    /**
+     * Synchronize the query data with the information from the backend.
+     *
+     * @return NULL
+     */
+    public function synchronize()
+    {
+    }
 }
\ No newline at end of file
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Query.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Query.php
index c353350de..2b32b0316 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Query.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Query.php
@@ -33,5 +33,12 @@ interface Horde_Kolab_Storage_Query
      * @param Horde_Kolab_Storage_Queriable $queriable The queriable object.
      */
     public function __construct(Horde_Kolab_Storage_Queriable $queriable);
+
+    /**
+     * Synchronize the query data with the information from the backend.
+     *
+     * @return NULL
+     */
+    public function synchronize();
 }
 
diff --git a/framework/Kolab_Storage/package.xml b/framework/Kolab_Storage/package.xml
index f449f61de..8d639ac97 100644
--- a/framework/Kolab_Storage/package.xml
+++ b/framework/Kolab_Storage/package.xml
@@ -31,8 +31,8 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2011-01-02</date>
- <time>07:30:52</time>
+ <date>2011-01-03</date>
+ <time>15:55:17</time>
  <version>
   <release>0.4.0</release>
   <api>0.1.0</api>
@@ -142,9 +142,13 @@
          <file name="Log.php" role="php" />
         </dir> <!-- /lib/Horde/Kolab/Storage/List/Decorator -->
         <dir name="Query">
+         <dir name="Decorator">
+          <file name="Cache.php" role="php" />
+         </dir> <!-- /lib/Horde/Kolab/Storage/List/Query/Decorator -->
          <file name="Base.php" role="php" />
         </dir> <!-- /lib/Horde/Kolab/Storage/List/Query -->
         <file name="Base.php" role="php" />
+        <file name="Query.php" role="php" />
        </dir> <!-- /lib/Horde/Kolab/Storage/List -->
        <file name="Base.php" role="php" />
        <file name="Cache.php" role="php" />
@@ -433,6 +437,9 @@
        <dir name="Server">
         <file name="DriverTest.php" role="test" />
        </dir> <!-- /test/Horde/Kolab/Storage/Server -->
+       <dir name="Stub">
+        <file name="FactoryQuery.php" role="test" />
+       </dir> <!-- /test/Horde/Kolab/Storage/Stub -->
        <dir name="Unit">
         <dir name="Decorator">
          <file name="CacheTest.php" role="test" />
@@ -454,6 +461,7 @@
         </dir> <!-- /test/Horde/Kolab/Storage/Unit/Folder -->
         <dir name="List">
          <dir name="Decorator">
+          <file name="CacheTest.php" role="test" />
           <file name="LogTest.php" role="test" />
          </dir> <!-- /test/Horde/Kolab/Storage/Unit/List/Decorator -->
          <dir name="Query">
@@ -462,13 +470,13 @@
          <file name="BaseTest.php" role="test" />
         </dir> <!-- /test/Horde/Kolab/Storage/Unit/List -->
         <file name="BaseTest.php" role="test" />
+        <file name="CacheTest.php" role="test" />
         <file name="FactoryTest.php" role="test" />
        </dir> <!-- /test/Horde/Kolab/Storage/Unit -->
        <file name="AclTest.php" role="test" />
        <file name="AllTests.php" role="test" />
        <file name="AttachmentTest.php" role="test" />
        <file name="Autoload.php" role="test" />
-       <file name="CacheTest.php" role="test" />
        <file name="conf.php.dist" role="test" />
        <file name="DataTest.php" role="test" />
        <file name="FolderTest.php" role="test" />
@@ -617,9 +625,11 @@
    <install as="Horde/Kolab/Storage/Folder/Permission/Element/Guest.php" name="lib/Horde/Kolab/Storage/Folder/Permission/Element/Guest.php" />
    <install as="Horde/Kolab/Storage/Folder/Permission/Element/User.php" name="lib/Horde/Kolab/Storage/Folder/Permission/Element/User.php" />
    <install as="Horde/Kolab/Storage/List/Base.php" name="lib/Horde/Kolab/Storage/List/Base.php" />
+   <install as="Horde/Kolab/Storage/List/Query.php" name="lib/Horde/Kolab/Storage/List/Query.php" />
    <install as="Horde/Kolab/Storage/List/Decorator/Cache.php" name="lib/Horde/Kolab/Storage/List/Decorator/Cache.php" />
    <install as="Horde/Kolab/Storage/List/Decorator/Log.php" name="lib/Horde/Kolab/Storage/List/Decorator/Log.php" />
    <install as="Horde/Kolab/Storage/List/Query/Base.php" name="lib/Horde/Kolab/Storage/List/Query/Base.php" />
+   <install as="Horde/Kolab/Storage/List/Query/Decorator/Cache.php" name="lib/Horde/Kolab/Storage/List/Query/Decorator/Cache.php" />
    <install as="locale/Horde_Kolab_Storage.pot" name="locale/Horde_Kolab_Storage.pot" />
    <install as="locale/ar/LC_MESSAGES/Horde_Kolab_Storage.mo" name="locale/ar/LC_MESSAGES/Horde_Kolab_Storage.mo" />
    <install as="locale/ar/LC_MESSAGES/Horde_Kolab_Storage.po" name="locale/ar/LC_MESSAGES/Horde_Kolab_Storage.po" />
@@ -711,7 +721,6 @@
    <install as="Horde/Kolab/Storage/AllTests.php" name="test/Horde/Kolab/Storage/AllTests.php" />
    <install as="Horde/Kolab/Storage/AttachmentTest.php" name="test/Horde/Kolab/Storage/AttachmentTest.php" />
    <install as="Horde/Kolab/Storage/Autoload.php" name="test/Horde/Kolab/Storage/Autoload.php" />
-   <install as="Horde/Kolab/Storage/CacheTest.php" name="test/Horde/Kolab/Storage/CacheTest.php" />
    <install as="Horde/Kolab/Storage/conf.php.dist" name="test/Horde/Kolab/Storage/conf.php.dist" />
    <install as="Horde/Kolab/Storage/DataTest.php" name="test/Horde/Kolab/Storage/DataTest.php" />
    <install as="Horde/Kolab/Storage/FolderTest.php" name="test/Horde/Kolab/Storage/FolderTest.php" />
@@ -722,7 +731,9 @@
    <install as="Horde/Kolab/Storage/TestCase.php" name="test/Horde/Kolab/Storage/TestCase.php" />
    <install as="Horde/Kolab/Storage/TriggerTest.php" name="test/Horde/Kolab/Storage/TriggerTest.php" />
    <install as="Horde/Kolab/Storage/Server/DriverTest.php" name="test/Horde/Kolab/Storage/Server/DriverTest.php" />
+   <install as="Horde/Kolab/Storage/Stub/FactoryQuery.php" name="test/Horde/Kolab/Storage/Stub/FactoryQuery.php" />
    <install as="Horde/Kolab/Storage/Unit/BaseTest.php" name="test/Horde/Kolab/Storage/Unit/BaseTest.php" />
+   <install as="Horde/Kolab/Storage/Unit/CacheTest.php" name="test/Horde/Kolab/Storage/Unit/CacheTest.php" />
    <install as="Horde/Kolab/Storage/Unit/FactoryTest.php" name="test/Horde/Kolab/Storage/Unit/FactoryTest.php" />
    <install as="Horde/Kolab/Storage/Unit/Decorator/CacheTest.php" name="test/Horde/Kolab/Storage/Unit/Decorator/CacheTest.php" />
    <install as="Horde/Kolab/Storage/Unit/Decorator/LogTest.php" name="test/Horde/Kolab/Storage/Unit/Decorator/LogTest.php" />
@@ -735,6 +746,7 @@
    <install as="Horde/Kolab/Storage/Unit/Folder/NamespaceTest.php" name="test/Horde/Kolab/Storage/Unit/Folder/NamespaceTest.php" />
    <install as="Horde/Kolab/Storage/Unit/Folder/TypeTest.php" name="test/Horde/Kolab/Storage/Unit/Folder/TypeTest.php" />
    <install as="Horde/Kolab/Storage/Unit/List/BaseTest.php" name="test/Horde/Kolab/Storage/Unit/List/BaseTest.php" />
+   <install as="Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php" name="test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php" />
    <install as="Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php" name="test/Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php" />
    <install as="Horde/Kolab/Storage/Unit/List/Query/BaseTest.php" name="test/Horde/Kolab/Storage/Unit/List/Query/BaseTest.php" />
    <install as="TODO" name="TODO" />
@@ -808,7 +820,7 @@
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2011-01-02</date>
+   <date>2011-01-03</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
 * Added namespace support (Bug #6691).
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Stub/FactoryQuery.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Stub/FactoryQuery.php
index 8c3d829bf..17a93ca8f 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Stub/FactoryQuery.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Stub/FactoryQuery.php
@@ -24,4 +24,13 @@ implements Horde_Kolab_Storage_Query
     {
         $this->called = true;
     }
+
+    /**
+     * Synchronize the query data with the information from the backend.
+     *
+     * @return NULL
+     */
+    public function synchronize()
+    {
+    }
 }
\ No newline at end of file
-- 
2.11.0