Update of /var/cvs/html/mmbase/components/core/cache
In directory james.mmbase.org:/tmp/cvs-serv10319

Modified Files:
        show.jspx 
Log Message:
finished, rewritten to a block



See also: http://cvs.mmbase.org/viewcvs/html/mmbase/components/core/cache


Index: show.jspx
===================================================================
RCS file: /var/cvs/html/mmbase/components/core/cache/show.jspx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- show.jspx   26 Mar 2008 09:46:15 -0000      1.7
+++ show.jspx   11 Apr 2008 10:28:54 -0000      1.8
@@ -18,7 +18,7 @@
   <c:forEach items="${cache.entrySet}" var="entry" end="500" 
varStatus="status">
     <c:if test="${deleteentry eq status.index}">
       <div class="msg">
-        Removed <mm:function set="caches" name="remove" referids="[EMAIL 
PROTECTED],[EMAIL PROTECTED]" /> from cache.
+        Removed '<mm:function set="caches" name="remove" referids="[EMAIL 
PROTECTED],[EMAIL PROTECTED]" />' from cache.
       </div>
     </c:if>
   </c:forEach>
@@ -49,31 +49,25 @@
 
       <c:forEach items="${cache.entrySet}" var="entry" end="500" 
varStatus="status">
         <mm:context>
-          <mm:voidfunction id="k" set="utils" name="toString" referids="[EMAIL 
PROTECTED]" />
-
-          <mm:write value="${entry.key}">
-            <mm:compare regexp="${key}">
-              <mm:write value="${entry.value}">
-                <mm:compare regexp="${value}">
+          <mm:import id="ckey" jspvar="ckey" 
reset="true">${entry.key}</mm:import>
+          <mm:import id="cvalue" reset="true">${entry.value}</mm:import>
+          <mm:compare referid="ckey" regexp="${key}">
+            <mm:compare referid="cvalue" regexp="${value}">
                   <tr>
-                    <td class="view">${status.index}</td>
-                    <td class="center">
-                       ${cache.counts[entry.key]}
-                    </td>
+                <td class="view">${status.index} </td>
+                <td class="center">${cache.counts[ckey]} </td>
                     <td>${entry.key} </td>
                     <td>${entry.value} </td>
                     <td class="center">
                       <mm:link referids="[EMAIL PROTECTED]">
-                        <mm:param name="deletekey" value="${entry.key}" />
+                    <mm:param name="deletekey" value="$ckey" />
                         <mm:param name="deleteentry" value="${status.index}" />
                         <a title="remove this entry" href="${_}"><img 
src="${mm:link('/mmbase/style/images/delete.png')}" alt="remove" /></a>
                       </mm:link>
                     </td>
                   </tr>
                 </mm:compare>
-              </mm:write>
             </mm:compare>
-          </mm:write>
         </mm:context>
       </c:forEach>
       
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to