Update of /var/cvs/contributions/lucene/templates
In directory james.mmbase.org:/tmp/cvs-serv19658/templates

Modified Files:
        index.jspx 
Log Message:
better report full index in admin pages


See also: http://cvs.mmbase.org/viewcvs/contributions/lucene/templates


Index: index.jspx
===================================================================
RCS file: /var/cvs/contributions/lucene/templates/index.jspx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- index.jspx  1 Feb 2008 11:11:06 -0000       1.31
+++ index.jspx  1 Feb 2008 12:40:42 -0000       1.32
@@ -79,13 +79,19 @@
                 </td>
                 <td class="numeric">
                   <mm:function module="lucene" referids="index" 
name="searchsize">
-                    ${_}
+                    <jsp:text>${_}</jsp:text>
                   </mm:function>
                   <mm:link>
                     <mm:param name="clear">${index}</mm:param>
-                    (<a href="${_}">X</a>)
+                    <jsp:text> (</jsp:text>
+                    <a onclick="return confirm('Are you sure? This will fully 
delete the index \\'${index}\\'.');"
+                       href="${_}">X</a>
+                    <jsp:text>)</jsp:text>
                   </mm:link>
                   <mm:functioncontainer>
+                    <mm:function referids="index" module="lucene" 
name="fullIndexing">
+                      <c:choose>
+                        <c:when test="${_ eq -1}">
                     <mm:param name="copy" value="true" />
                     <mm:function referids="index" module="lucene" 
name="searchsize">
                       /${_}
@@ -94,6 +100,12 @@
                       <mm:param name="clearcopy">${index}</mm:param>
                       (<a href="${_}">X</a>)
                     </mm:link>
+                        </c:when>
+                        <c:otherwise>
+                          /${_} (busy)
+                        </c:otherwise>
+                      </c:choose>
+                    </mm:function>
                   </mm:functioncontainer>
                 </td>
                 <td>
@@ -139,7 +151,7 @@
                     <mm:link>
                       <mm:param name="fullindex" value="$index" />
                       <a href="${_}" class="navigate"
-                         onclick="return confirm('Are you sure? This will 
fully delete the index \'${index}\', and may take some time.')"
+                         onclick="return confirm('Are you sure? This will 
fully delete the index \\'${index}\\', and may take some time.');"
                          >
                         <img src="${img.next}" alt="next"  />
                       </a>
@@ -149,7 +161,7 @@
               </tr>
             </c:catch>
             <c:if test="${! empty exception1}">
-              ${exception1}<![CDATA[</td></tr>]]>
+              <jsp:text>${exception1}</jsp:text><![CDATA[</td></tr>]]>
             </c:if>
           </mm:listfunction>
           <tr>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to