OLIO-3 - NoCache RFE patch

[Damien Cooke]

Hi All, I have constructed a patch that will potentially allow users to disable the caching facility. Regards Damien -- Damien Cooke Open Scalable Solutions Performance Performance & Applications Engineering Sun Microsystems Level 2, East Wing 50 Grenfell Street, Adelaide SA 5000 Australia Phone x58315 (x7058315 US callers) Email damien.co...@sun.com

# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Users/damien/damien/documents/Work/PAE/olio/trunk
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: etc/config.php
--- etc/config.php Base (BASE)
+++ etc/config.php Locally Modified (Based On LOCAL)
@@ -33,6 +33,8 @@
 $web20config['dbPass'] = 'web20'; // DB password.
 
 $web20config['cacheSystem'] = 'MemCached';
+$web20config['cacheSystemIsActive'] = 'True';
+//previous added by DC to add support for a non active cache system
 
 $web20config['cacheExpire'] = 7200; // Expiry time for memcache on set function in seconds
 
Index: public_html/index.php
--- public_html/index.php Base (BASE)
+++ public_html/index.php Local Conflict (Based On LOCAL)
@@ -103,6 +103,14 @@
     session_unregister ("currentpage");
 }
 
+/*
+ * In order to ensure that we do not loop indefinately we jimmy the $cacheType
+ * if the cache is turned off.
+ */
+if(!CacheSystem::isCachingActive())
+{
+    $cacheType = 0;
+}
 switch ($cacheType) {
     case 0: noCachePage(); break;
     case 1: contentCachePage(); break;
@@ -188,6 +196,7 @@
     global $order, $numPages, $curr_page, $prev_page, $next_page, $offset;
 
     $cache = CacheSystem::getInstance();
+
     for (;;) {
         $fillContent = $cache->get('HomeContent');
         if ($fillContent != '') {