Changeset 152 for trunk/bin

Timestamp:

Jun 7, 2006 5:35:16 AM (18 years ago)

Author:

scdev

Message:

Q - In the middle of working on the Prefs and Cache instantiation mode...can't decide to use singleton pattern or global vars. Updated ImageThumb? to allow filenames with path elements such as 01/23/4567_file.jpg.

File:

• trunk/bin/module_maker/skel/admin.php (modified) (14 diffs)

trunk/bin/module_maker/skel/admin.php

@@ -14 +14 @@
 
 require_once 'codebase/lib/PageNumbers.inc.php';
-require_once 'codebase/lib/SessionCache.inc.php';
+require_once 'codebase/lib/Cache.inc.php';
 require_once 'codebase/lib/FormValidator.inc.php';
 require_once 'codebase/lib/SortOrder.inc.php';
@@ -33 +33 @@
 $fv = new FormValidator();
 
-$cache =& Cache::getInstance();
+// Configure the prefs object.
+$prefs =& Prefs::getInstance('%NAME_PLURAL%');
+$prefs->setParam(array('persistent' => false));
+
+// Configure the cache object.
+$cache =& Cache::getInstance('%NAME_PLURAL%');
+$cache->setParam(array('enable' => true));
 
 %SORT_ORDER%
 
-// Instantiate page numbers. Total items are set and calculation is done in the getRecordList function.
+// Instantiate page numbers. Total items are set and calculation is done in the getCachedList function.
 $page = new PageNumbers();
 $page->setPerPage(getFormData('per_page'), 100);
@@ -57 +63 @@
 
 if (getFormData('break_list_cache', false)) {
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 }
 
@@ -171 +177 @@
 default :
 //     $auth->requireAccessClearance(ZONE_ADMIN_%NAME_UPPER%_FUNC_LIST, _("Permission to view %NAME_PLURAL% list denied."));
-    $list =& getRecordList();
+    $list =& getCachedList();
     $main_template = '%ADMIN_LIST_TEMPLATE%';
     break;
@@ -250 +256 @@
     global $lock;
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance();
+    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
@@ -257 +263 @@
     }
 
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 
     // Get the information for this object.
@@ -285 +291 @@
     global $auth;
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance();
+    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 
 %INSERT%
@@ -306 +312 @@
     global $auth, $lock;
     $app =& App::getInstance();
-    $cache =& Cache::getInstance();
+    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%']);
@@ -313 +319 @@
     }
 
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 
 %UPDATE%
@@ -328 +334 @@
 }
 
-function &getRecordList()
+function &getCachedList()
 {
     global $page;
     global $so;
-    $db =& DB::getInstance();
-    $prefs =& Prefs::getInstance();
-    $cache =& Cache::getInstance();
-    
+    $db =& DB::getInstance();   
+    $prefs =& Prefs::getInstance('%NAME_PLURAL%');
+    $cache =& Cache::getInstance('%NAME_PLURAL%');
+    
     $where_clause = '';
 
@@ -377 +383 @@
     ";
 
+    // Use a cash hash to determine if the result-set has changed.
     // A unique key for this query, with the total_items in case db records
     // were added since the last cache. This identifies a unique set of
@@ -383 +390 @@
     // without knowing the hash.
     $cache_hash = md5($sql . '|' . $page->total_items);
-    if ($prefs->get('cache_hash', $_SERVER['PHP_SELF']) != $cache_hash) {
-        $cache->delete($_SERVER['PHP_SELF']);
-        $prefs->set('cache_hash', $cache_hash, $_SERVER['PHP_SELF']);
-    }
-
-    if ($cache->exists($_SERVER['PHP_SELF'])) {
-        // Get the cached results.
-        $list = $cache->get($_SERVER['PHP_SELF']);
-    } else {
-        // If the list is not already cached, query now.
-        $qid = $db->query($sql);
-        // Fill an array with the items for this page.
-        while ($row = mysql_fetch_assoc($qid)) {
-            $list[] = $row;
-        }
-
-        if (isset($list) && !empty($list)) {
-            // Cache the results.
-            $cache->set($list, $_SERVER['PHP_SELF']);
-        }
+    if ($prefs->get('cache_hash') != $cache_hash) {
+        $cache->delete('list');
+        $prefs->set('cache_hash', $cache_hash);
+    }
+
+    // First try to return from the cache.
+    if ($cache->exists('list')) {
+        return $cache->get('list');
+    }
+    
+    // The list was not cached, so issue the real query.
+    $qid = $db->query($sql);
+    while ($row = mysql_fetch_assoc($qid)) {
+        $list[] = $row;
+    }
+
+    // Save this list into the cache.
+    if (isset($list) && !empty($list)) {
+        $cache->set('list', $list);
     }
 
@@ -411 +417 @@
 {
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance();
+    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
     if (!is_array($ranks)) {
@@ -418 +424 @@
     }
 
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 
     // Count the ranks with invalid numbers