Changeset 444

Timestamp:

01/06/08 03:07:38 (12 months ago)

Author:

padams

Message:

- refactored cacheFacade into a real facade instead of an abstract class so that it can be made plugable in the future.
- fixed php4 missing reference on cache class that was causing objects to not get persisted.

Location:

trunk

Files:

• modules/base/classes/cache.php (modified) (8 diffs)
• modules/base/classes/cacheFacade.php (modified) (2 diffs)
• owa_coreAPI.php (modified) (1 diff)

trunk/modules/base/classes/cache.php

@@ -41 +41 @@
         var $collections;
         var $dirty_collections;
-        var $dirty_objs;
+        var $dirty_objs = array();
         var $file_perms = 0775;
         var $dir_perms = 0775;
@@ -47 +47 @@
         var $non_persistant_collections = array();
         var $mutex;
-
+        var $e;
 
         /**
@@ -56 +56 @@
          * @param $cache_dir string
          */
-        function __construct($cache_dir) {
-        
+        function __construct($cache_dir = '') {
+                
+                $this->e = &owa_coreAPI::errorSingleton();
                 return $this->cache_dir = $cache_dir;
         
         }
 
-        function owa_cache($cache_dir) {
+        function owa_cache($cache_dir = '') {
                 
                 register_shutdown_function(array(&$this, "__destruct"));
@@ -90 +91 @@
                 if (!in_array($collection, $this->non_persistant_collections)):
                         $this->dirty_objs[$collection][] = $hkey;
+                        //$this->debug(print_r($this->dirty_objs, true));
                         $this->dirty_collections[$collection] = true; 
                         $this->debug(sprintf('Added Object to Dirty List - Collection: %s, id: %s', $collection, $hkey));
@@ -259 +261 @@
         
         function __destruct() {
-        
+                
                 $this->persistCache();
                 $this->debug($this->getStats());
@@ -269 +271 @@
         function persistCache() {
                 
+                $this->debug("starting to persist cache...");
+                
                 // check for dirty objects
                 if (!empty($this->dirty_objs)):
-                
+                        
+                        $this->debug('Dirty Objects: '.print_r($this->dirty_objs, true));
+                                
                         if ( ! $this->acquire_lock() ):
+                                $this->debug("could not persist cache due to not acquiring lock.");
                     return false;
                 else:
-                
+                                $this->debug("starting to persist cache...");
                                 // make directories for collections
                                 foreach ($this->dirty_collections as $k => $v) {
@@ -334 +341 @@
                         endif;
                         $this->release_lock();
+                
+                else:
+                        $this->debug("There seem to be no dirty objects in the cache to persist.");
                 endif;
         
@@ -369 +379 @@
         function debug($msg) {
                 
-                print $msg.'<br>';
+                $this->e->debug($msg);
                 return;
         }

trunk/modules/base/classes/cacheFacade.php

@@ -32 +32 @@
 require_once(OWA_BASE_CLASS_DIR.'cache.php');
 
-class owa_cacheFacade extends owa_cache {
+class owa_cacheFacade extends owa_base {
 
-        var $e;
-
+        
+        var $cache;
+        
         function __construct($cache_dir) {
+                
+                // make this plugable soon
+                $this->cache = &owa_coreAPI::supportClassFactory('base', 'cache');
+                
+                if (!empty($cache_dir)):
+                        $this->setCacheDir($cache_dir);
+                endif;
+                
+                return;
+        }
         
-                $this->e = &owa_coreAPI::errorSingleton();
-                return parent::__construct($cache_dir);
+        function owa_cacheFacade($cache_dir) {
+                
+                return $this->__construct($cache_dir);
+        
+        }
+        
+        function get($collection, $key) {
+        
+                return $this->cache->get($collection, $key);
+        
+        }
+        
+        function set($collection, $key, $value) {
+        
+                return $this->cache->set($collection, $key, $value);
         
         }
 
-        function owa_cacheFacade($cache_dir) {
+        function remove($collection, $key) {
                 
-                $this->e = &owa_coreAPI::errorSingleton();
-                return $this->owa_cache($cache_dir);
+                return $this->cache->remove($collection, $key);
+        }
         
+        function replace($collection, $key, $value) {
+                
+                return $this->cache->replace($collection, $key, $value);
+                
+        }
+        
+        function setCacheDir($dir) {
+        
+                return $this->cache->setCacheDir($dir);
+        }
+        
+        function flush() {
+        
+                return $this->cache->flush();
         }
         
@@ -55 +93 @@
                 
         }
+        
+        function setNonPersistantCollection($collection) {
+        
+                return $this->cache->setNonPersistantCollection($collection);
+        
+        }
+        
+        function setGlobalCollection($collection) {
+                
+                return $this->cache->setGloballCollection($collection);
+
+        }
+        
         
         function error($msg) {

trunk/owa_coreAPI.php

@@ -311 +311 @@
         }
         
-        function supportClassFactory($module, $class, $params = array()) {
-                
-                $obj = owa_lib::factory(OWA_BASE_DIR.DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'classes'.DIRECTORY_SEPARATOR, 'owa_', $class, $params);
+        function &supportClassFactory($module, $class, $params = array()) {
+                
+                $obj = &owa_lib::factory(OWA_BASE_DIR.DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'classes'.DIRECTORY_SEPARATOR, 'owa_', $class, $params);
                 $obj->module = $module;