[Zope-Checkins] CVS: Zope/lib/python/App/dtml - cacheGC.dtml:1.3.166.1 cacheParameters.dtml:1.3.166.1 manage_page_header.dtml:1.10.140.1
Casey Duncan
casey@zope.com
Wed, 27 Mar 2002 15:51:38 -0500
Update of /cvs-repository/Zope/lib/python/App/dtml
In directory cvs.zope.org:/tmp/cvs-serv22094/lib/python/App/dtml
Modified Files:
Tag: casey-death_to_index_html-branch
cacheGC.dtml cacheParameters.dtml manage_page_header.dtml
Log Message:
Updating branch to head for testing
=== Zope/lib/python/App/dtml/cacheGC.dtml 1.3 => 1.3.166.1 ===
<br />
<table width="100%" cellspacing="0" cellpadding="2" border="0">
-<tr class="section-bar">
- <td colspan="2" align="left">
- <div class="form-label">
- Full Sweep
- </div>
- </td>
-</tr>
-<tr>
- <td align="left" valign="top">
- <div class="form-text">
- Make a single pass through the cache, removing any objects that are no
- longer referenced, and deactivating objects that have not been
- accessed in the number of seconds given in the input box to the right
- of this text.
- </div>
- </td>
- <td>
- <form action="<dtml-var URL1>/manage_full_sweep" method="get">
- <input type="text" name="value:int" value="<dtml-var
- cache_age html_quote>" size="6" />
- <br />
- <div class="form-element">
- <input type="submit" name="submit" value="Full Sweep" />
- </div>
- </form>
- </td>
-</tr>
-
-<tr>
- <td colspan="2">
- <br />
- </td>
-</tr>
<tr class="section-bar">
<td colspan="2" align="left">
@@ -47,16 +14,10 @@
<tr>
<td align="left" valign="top">
<div class="form-text">
- Make multiple passes through the cache, removing any objects that are no
- longer referenced, and deactivating objects that have not been
- accessed in the number of seconds given in the input box to the right
- of this text.
+ Remove all objects from the ZODB in-memory cache
</td>
<td>
<form action="<dtml-var URL1>/manage_minimize" method=GET>
- <input type="text" name="value:int" value="<dtml-var
- cache_age html_quote>" size="6" />
- <br />
<div class="form-element">
<input type="submit" name="submit" value="Minimize" />
</div>
=== Zope/lib/python/App/dtml/cacheParameters.dtml 1.3 => 1.3.166.1 ===
<td align="left">
<div class="form-label">
- Total number of objects in all caches
+ Total number of objects in memory from all caches
</div>
</td>
<td>
@@ -31,7 +31,7 @@
<tr>
<td align="left">
<div class="form-label">
- Target Size
+ Target number of objects in memory per cache
</div>
</td>
<td>
@@ -45,22 +45,6 @@
</td>
</tr>
-<tr>
- <td align="left">
- <div class="form-label">
- Target max time between accesses
- </div>
- </td>
- <td>
- <form action="<dtml-var URL1>/manage_cache_age" method="get">
- <input type="text" name="value:int" value="<dtml-var
- cache_age html_quote>" size="6" />
- <span class="form-element">
- <input type="submit" name="submit" value="Change">
- </div>
- </form>
- </td>
-</tr>
<dtml-in cacheStatistics>
<tr>
@@ -72,6 +56,34 @@
</td>
</tr>
</dtml-in>
+
+<tr>
+ <td align="left" colspan=2>
+ <div class="form-label">
+ Total number of objects in each cache:
+ </div>
+ </td>
+</tr>
+
+<tr class="list-header">
+ <th><div class="list-item">Cache Name</div></th>
+ <th><div class="list-item">Number of object in memory</div></th>
+ <th><div class="list-item">Number of ghost objects</div></th>
+</tr>
+<dtml-in cache_detail_length mapping>
+<dtml-if name="sequence-odd"><tr class="row-normal">
+<dtml-else><tr class="row-hilite"></dtml-if>
+ <td><div class="form-text"><dtml-var connection html_quote></div></td>
+ <td><div class="form-text"><dtml-var ngsize></div></td>
+ <td><div class="form-text"><dtml-var size></div></td>
+</tr>
+</dtml-in>
+<tr class="row-hilite">
+ <td><div class="list-item">Total</div></td>
+ <td><div class="list-item"><dtml-var cache_length></div></td>
+ <td><div class="list-item"></div></td>
+</tr>
+
</table>
<dtml-if show_cache_detail>
=== Zope/lib/python/App/dtml/manage_page_header.dtml 1.10 => 1.10.140.1 ===
<html>
<head>
+<dtml-unless management_page_charset>
+<dtml-call "REQUEST.set('management_page_charset','iso-8859-1')">
+</dtml-unless>
+<meta http-equiv="content-type" content="text/html;charset=<dtml-var management_page_charset>">
+<dtml-call "RESPONSE.setHeader('content-type','text/html;charset='+management_page_charset)">
<title><dtml-if title><dtml-var title></dtml-if></title>
<dtml-let ag="REQUEST.get('HTTP_USER_AGENT', '')"
is_nav4="ag[:9] == 'Mozilla/4' and _.string.find(ag, 'MSIE') < 0"