Changeset 464

Timestamp:

01/13/08 20:57:27 (12 months ago)

Author:

padams

Message:

- added config id override in config file and caller.
- fixed cache bug where objects were attempted to be replced when they did not exist.

Location:

trunk

Files:

• conf/owa-config-dist.php (modified) (1 diff)
• modules/base/classes/cache.php (modified) (2 diffs)
• owa_caller.php (modified) (3 diffs)
• owa_php.php (modified) (1 diff)

trunk/conf/owa-config-dist.php

@@ -82 +82 @@
 //define('OWA_CACHE_OBJECTS', true);
 
+/**
+ * CONFIGURATION ID
+ *
+ * Override to load an alternative user configuration
+ */
+ 
+//define('OWA_CONFIGURATION_ID', '1');
 
 

trunk/modules/base/classes/cache.php

@@ -114 +114 @@
                 if (!in_array($collection, $this->non_persistant_collections)):
                         // check to make sure the dirty collection exists and object is not already in there.
-                        if (!empty($this->dirty_objs[$collection]) || !in_array($hkey, $this->dirty_objs[$collection])):
+                        if (!empty($this->dirty_objs[$collection])):
+                                if(!in_array($hkey, $this->dirty_objs[$collection])):
+                                        $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));
+                                        $this->statistics['dirty']++;
+                                endif;
+                        else:
                                 $this->dirty_objs[$collection][] = $hkey;
                                 //$this->debug(print_r($this->dirty_objs, true));
@@ -121 +129 @@
                                 $this->statistics['dirty']++;
                         endif;
+                        
                 // check to see if cache file exists and remove it just in case the collection
                 // was recently added to the non persistant list.

trunk/owa_caller.php

@@ -138 +138 @@
                         endif;
                         
+                        /* CONFIGURATION ID */
+                        
+                        if (defined('OWA_CONFIGURATION_ID')):
+                                $this->c->set('base', 'configuration_id', OWA_CONFIGURATION_ID);
+                        endif;
+                        
                 endif;
                         
@@ -180 +186 @@
                         $this->c->load($this->c->get('base', 'configuration_id'));
                 endif;
-
+                
+                /**
+                 * Post User Config Framework Setup
+                 *
+                 */
+                
+                // Looks for log handler constant from config file
+                if (defined('OWA_ERROR_HANDLER')):
+                        $this->c->set('base', 'error_handler', OWA_ERROR_HANDLER);
+                endif;
+                
+                // Sets the correct mode of the error logger now that final config values are in place
+                // This will flush buffered msgs that were thrown up untill this point
+                $this->e->setHandler($this->c->get('base', 'error_handler'));
+                
+                // Create Request Container
+                $this->params = &owa_requestContainer::getInstance();
+                
+                // Load the core API
+                $this->api = &owa_coreAPI::singleton();
+                $this->api->caller_config_overrides = $config;
+                
+                // should only be called once to load all modules
+                $this->api->setupFramework();
+                
+                // needed in standalone installs where site_id is not set in config file.
+                if ($this->params['site_id']):
+                        $this->c->set('base', 'site_id', $this->params['site_id']);
+                endif;
                 
                 // re-fetch the array now that overrides have been applied.
@@ -186 +220 @@
                 $this->config = $this->c->fetch('base');
 
-                
-                /**
-                 * Post Config Framework Setup
-                 *
-                 */
-                
-                // Looks for log handler constant from config file
-                if (defined('OWA_ERROR_HANDLER')):
-                        $this->c->set('base', 'error_handler', OWA_ERROR_HANDLER);
-                endif;
-                
-                
-                // Sets the correct mode of the error logger now that final config values are in place
-                // This will flush buffered msgs that were thrown up untill this point
-                $this->e->setHandler($this->c->get('base', 'error_handler'));
-                
-                // Create Request Container
-                $this->params = &owa_requestContainer::getInstance();
-                
-                // Load the core API
-                $this->api = &owa_coreAPI::singleton();
-                $this->api->caller_config_overrides = $config;
-                
-                // should only be called once to load all modules
-                $this->api->setupFramework();
-                
-                // needed in standalone installs where site_id is not set in config file.
-                if ($this->params['site_id']):
-                        $this->c->set('base', 'site_id', $this->params['site_id']);
-                endif;
-                
                 return;
         

trunk/owa_php.php

@@ -45 +45 @@
                 
         }
-        
-        
-        /*
-function __construct($config = null) {
-                //return;
-                return $this->owa_caller($config);
-        
-        }
-
-*/
 
 }