[Zope-Checkins] SVN: Zope/trunk/src/App/ Merged c105511 from 2.12 branch

[Hanno Schlichting]

Log message for revision 105512:
  Merged c105511 from 2.12 branch
  

Changed:
  U   Zope/trunk/src/App/CacheManager.py
  U   Zope/trunk/src/App/dtml/cacheParameters.dtml

-=-
Modified: Zope/trunk/src/App/CacheManager.py
===================================================================
--- Zope/trunk/src/App/CacheManager.py	2009-11-08 01:06:06 UTC (rev 105511)
+++ Zope/trunk/src/App/CacheManager.py	2009-11-08 01:08:10 UTC (rev 105512)
@@ -17,8 +17,6 @@
 $Id$'''
 __version__='$Revision: 1.31 $'[11:-2]
 
-import time
-
 from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from App.ImageFile import ImageFile
@@ -44,6 +42,9 @@
     def cache_length(self):
         return self._getDB().cacheSize()
 
+    def cache_length_bytes(self):
+        return self._getDB().getCacheSizeBytes()
+
     def cache_detail_length(self):
         return self._getDB().cacheDetailSize()
 
@@ -76,28 +77,6 @@
             response=REQUEST['RESPONSE']
             response.redirect(REQUEST['URL1']+'/manage_cacheParameters')
 
-
-    # BoboPOS 2
-    def cache_mean_age(self):
-        import Globals  # for data
-        return Globals.Bobobase._jar.cache.cache_mean_age/60.0
-
-    # BoboPOS 2
-    def cache_mean_deal(self):
-        import Globals  # for data
-        return Globals.Bobobase._jar.cache.cache_mean_deal*60
-
-    # BoboPOS 2
-    def cache_mean_deac(self):
-        import Globals  # for data
-        return Globals.Bobobase._jar.cache.cache_mean_deac*60
-
-    # BoboPOS 2
-    def cache_last_gc_time(self):
-        import Globals  # for data
-        t = Globals.Bobobase._jar.cache.cache_last_gc_time
-        return time.asctime(time.localtime(t))
-
     def manage_full_sweep(self,value,REQUEST):
         "Perform a full sweep through the cache"
         db = self._getDB()

Modified: Zope/trunk/src/App/dtml/cacheParameters.dtml
===================================================================
--- Zope/trunk/src/App/dtml/cacheParameters.dtml	2009-11-08 01:06:06 UTC (rev 105511)
+++ Zope/trunk/src/App/dtml/cacheParameters.dtml	2009-11-08 01:08:10 UTC (rev 105512)
@@ -42,6 +42,19 @@
 </tr>
 
 <tr>
+  <td align="left">
+  <div class="form-label">
+  Target memory size per cache in bytes
+  </div>
+  </td>
+  <td>
+  <div class="form-text">
+  &dtml-cache_length_bytes;
+  </div>
+  </td>
+</tr>
+
+<tr>
   <td align="left" colspan=2>
   <div class="form-label">
   Total number of objects in each cache: