[Zope-Checkins] CVS: Zope/lib/python/App - CacheManager.py:1.24

[Toby Dickenson]

Update of /cvs-repository/Zope/lib/python/App
In directory cvs.zope.org:/tmp/cvs-serv10497/lib/python/App

Modified Files:
	CacheManager.py 
Log Message:
merged toby-stiff-cache-branch and toby-unicode-branch

=== Zope/lib/python/App/CacheManager.py 1.23 => 1.24 ===
         else: return db.cacheSize()
 
+    def cache_detail_length(self):
+      try: db=self._p_jar.db()
+      except:
+          return ()
+      else: return db.cacheDetailSize()
+
     def database_size(self):
         try: db=self._p_jar.db()
         except:
@@ -156,7 +162,7 @@
             response=REQUEST['RESPONSE']
             response.redirect(REQUEST['URL1']+'/manage_cacheGC')
 
-    def manage_minimize(self,value,REQUEST):
+    def manage_minimize(self,value=1,REQUEST=None):
         "Perform a full sweep through the cache"
         try: db=self._p_jar.db()
         except:
@@ -206,7 +212,6 @@
             # sort the list.
             lst = map(lambda dict: ((dict['conn_no'], dict['oid']), dict),
                       detail)
-            lst.sort()
             # format as text.
             res = [
                 '# Table shows connection number, oid, refcount, state, '