knguyen 2005/06/03 12:30:36 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/views/jsp/jahia/administration/search/include
operations.jsp
status.jsp
Log:
- give more info on background indexation
- cluster issue
Revision Changes Path
1.9.6.2 +4 -4
jahia/src/views/jsp/jahia/administration/search/include/operations.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/administration/search/include/operations.jsp.diff?r1=1.9.6.1&r2=1.9.6.2&f=h
1.1.2.2 +141 -10
jahia/src/views/jsp/jahia/administration/search/include/status.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/administration/search/include/status.jsp.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
Index: operations.jsp
===================================================================
RCS file:
/cvs/jahia/src/views/jsp/jahia/administration/search/include/Attic/operations.jsp,v
retrieving revision 1.9.6.1
retrieving revision 1.9.6.2
diff -u -r1.9.6.1 -r1.9.6.2
--- operations.jsp 18 May 2005 13:54:23 -0000 1.9.6.1
+++ operations.jsp 3 Jun 2005 10:30:36 -0000 1.9.6.2
@@ -13,11 +13,11 @@
Boolean isLynx = (Boolean) request.getAttribute("isLynx"); // Linx.
Boolean indexExists = (Boolean) request.getAttribute("indexExists"); //
Does the index exist or not.
- SiteIndexationJobDetail indJob =
(SiteIndexationJobDetail)request.getAttribute("jobDetail");
+ SiteIndexationStatus siteIndexationStatus =
(SiteIndexationStatus)request.getAttribute("siteIndexationStatus");
boolean siteIndexationIsRunningInBackground = false;
- if ( indJob != null ){
- siteIndexationIsRunningInBackground = !indJob.isDone();
- }
+ if ( siteIndexationStatus != null ){
+ siteIndexationIsRunningInBackground =
!siteIndexationStatus.isDone();
+ }
%>
Index: status.jsp
===================================================================
RCS file:
/cvs/jahia/src/views/jsp/jahia/administration/search/include/Attic/status.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- status.jsp 18 May 2005 13:54:23 -0000 1.1.2.1
+++ status.jsp 3 Jun 2005 10:30:36 -0000 1.1.2.2
@@ -1,4 +1,5 @@
-<[EMAIL PROTECTED] import = "java.util.*" %>
+<[EMAIL PROTECTED] import = "java.util.*" %>
+<[EMAIL PROTECTED] import = "java.text.DateFormat" %>
<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia" %>
<[EMAIL PROTECTED] import="org.jahia.bin.*"%>
@@ -11,27 +12,89 @@
<%
Boolean isLynx = (Boolean) request.getAttribute("isLynx"); // Linx.
+ Integer nbDocsInMainQueue = (Integer)
request.getAttribute("nbDocsInMainQueue");
+ if ( nbDocsInMainQueue == null ){
+ nbDocsInMainQueue = new Integer(0);
+ }
+ Integer nbFilesInMainQueue = (Integer)
request.getAttribute("nbFilesInMainQueue");
+ if ( nbFilesInMainQueue == null ){
+ nbFilesInMainQueue = new Integer(0);
+ }
- SiteIndexationJobDetail indJob =
(SiteIndexationJobDetail)request.getAttribute("jobDetail");
+ SiteIndexationStatus siteIndexationStatus =
(SiteIndexationStatus)request.getAttribute("siteIndexationStatus");
boolean siteIndexationIsRunningInBackground = false;
- if ( indJob != null ){
- siteIndexationIsRunningInBackground = !indJob.isDone();
- }
+ int nbDocsToIndex = 0;
+ int nbIndexedDocs = 0;
+ int nbDocsLeft = 0;
+
+ String startTime = "";
+ String endTime = "";
+ String elapsedTime = "";
+ DateFormat dateFormat =
DateFormat.getTimeInstance(DateFormat.MEDIUM,request.getLocale());
+ dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+ if ( siteIndexationStatus != null ){
+ siteIndexationIsRunningInBackground =
(!siteIndexationStatus.isDone() && !siteIndexationStatus.isShutdown());
+ nbDocsToIndex = siteIndexationStatus.getNbDocsToIndex();
+ nbIndexedDocs = siteIndexationStatus.getNbIndexedDocs();
+ nbDocsLeft = nbDocsToIndex - nbIndexedDocs;
+ startTime =
DateFormat.getDateTimeInstance(DateFormat.LONG,DateFormat.MEDIUM,request.getLocale())
+ .format(new
Date(siteIndexationStatus.getStartingTime()));
+ endTime =
DateFormat.getDateTimeInstance(DateFormat.LONG,DateFormat.MEDIUM,request.getLocale())
+ .format(new
Date(siteIndexationStatus.getEndTime()));
+ long diff = 0;
+ if ( siteIndexationStatus.getEndTime() != 0 ){
+ diff = siteIndexationStatus.getEndTime() -
siteIndexationStatus.getStartingTime();
+ } else {
+ diff = System.currentTimeMillis() -
siteIndexationStatus.getStartingTime();
+ }
+ Date d = new Date(diff);
+ elapsedTime = dateFormat.format(d);
+ }
%>
-<table border="0" cellpadding="1" cellspacing="0" width="90%">
+<table border="0" cellpadding="1" cellspacing="0" width="100%">
<tr>
- <td class="text" colspan="2" align="left">
+ <td class="text" align="left">
+ <br><br><br>
+ <b><jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.mainQueueStatus.label"/> :</b>
+ <br><br>
+ </td>
+</tr>
+<tr>
+ <td class="text" align="left">
+ <table border="0" cellpadding="1" cellspacing="0">
+ <tr>
+ <td class="text" align="left"
valign="top"><%if(!isLynx.booleanValue()){%><li><%}%></td>
+ <td class="text" align="left" valign="top" nowrap>
+
<jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.nbOfDocsInMainQueue.label"/>
+ </td>
+ <td class="text" align="left"> : </td>
+ <td class="text"
align="left"><%=nbDocsInMainQueue.intValue()%></td>
+ </tr>
+ <tr><td colspan="4" height="5"></td></tr>
+ <tr>
+ <td class="text" align="left"
valign="top"><%if(!isLynx.booleanValue()){%><li><%}%></td>
+ <td class="text" align="left" valign="top" nowrap>
+
<jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.nbOfFilesInMainQueue.label"/>
+ </td>
+ <td class="text" align="left"> : </td>
+ <td class="text"
align="left"><%=nbFilesInMainQueue.intValue()%></td>
+ </tr>
+ </table>
+ </td>
+</tr>
+<br>
+<tr>
+ <td class="text" align="left">
<br><br><br>
- <b><jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.label"/> :</b>
+ <b><jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.fullSiteIndexationStatus.label"/> :</b>
<br><br>
</td>
</tr>
<tr>
- <td class="text" width="20"> </td>
<td class="text" align="left">
- <table border="0" cellpadding="1" cellspacing="0" width="90%">
+ <table border="0" cellpadding="1" cellspacing="0" width="100%">
<tr>
<td class="text" align="left" valign="top">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.aFullSiteIndexationIsRunning.label"/>
@@ -46,6 +109,74 @@
</td>
</tr>
</table>
+ <br><br>
+ <% if ( siteIndexationStatus != null &&
!siteIndexationStatus.isShutdown() ) { %>
+ <table border="0" cellpadding="1" cellspacing="0" width="100%">
+ <tr>
+ <td class="text" align="left"
valign="top"><%if(!isLynx.booleanValue()){%><li><%}%></td>
+ <td class="text" align="left" valign="top">
+
<jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.lastFullIndexationStartedAt.label"/>
+ </td>
+ <td class="text" align="left"> : </td>
+ <td class="text" align="left" nowrap><%=startTime%></td>
+ </tr>
+ <tr><td colspan="4" height="5"></td></tr>
+ <% if ( siteIndexationStatus.getEndTime() != 0 ){ %>
+ <tr>
+ <td class="text" align="left"
valign="top"><%if(!isLynx.booleanValue()){%><li><%}%></td>
+ <td class="text" align="left" valign="top">
+
<jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.finishedAt.label"/>
+ </td>
+ <td class="text" align="left"> : </td>
+ <td class="text" align="left" nowrap><%=endTime%></td>
+ </tr>
+ <tr><td colspan="4" height="5"></td></tr>
+ <% } else { %>
+ <tr><td colspan="4" height="5"></td></tr>
+ <% } %>
+ <% if ( !"".equals(elapsedTime) ){ %>
+ <tr>
+ <td class="text" align="left"
valign="top"><%if(!isLynx.booleanValue()){%><li><%}%></td>
+ <td class="text" align="left" valign="top">
+
<jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.elapsedTime.label"/>
+ </td>
+ <td class="text" align="left"> : </td>
+ <td class="text" align="left" nowrap><%=elapsedTime%></td>
+ </tr>
+ <tr><td colspan="4" height="5"></td></tr>
+ <% } else { %>
+ <tr><td colspan="4" height="5"></td></tr>
+ <% } %>
+ <tr>
+ <td class="text" align="left"
valign="top"><%if(!isLynx.booleanValue()){%><li><%}%></td>
+ <td class="text" align="left" valign="top">
+
<jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.totalNumberOfDocsToIndex.label"/>
+ </td>
+ <td class="text" align="left"> : </td>
+ <td class="text" align="left"><%=nbDocsToIndex%></td>
+ </tr>
+ <tr><td colspan="4" height="5"></td></tr>
+ <tr>
+ <td class="text" align="left"
valign="top"><%if(!isLynx.booleanValue()){%><li><%}%></td>
+ <td class="text" align="left" valign="top">
+
<jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.nbOfDocsAddedToIndexationQueue.label"/>
+ </td>
+ <td class="text" align="left"> : </td>
+ <td class="text" align="left"><%=nbIndexedDocs%></td>
+ </tr>
+ <tr><td colspan="4" height="5"></td></tr>
+ <tr>
+ <td class="text" align="left"
valign="top"><%if(!isLynx.booleanValue()){%><li><%}%></td>
+ <td class="text" align="left" valign="top">
+
<jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.status.nbOfDocsLeft.label"/>
+ </td>
+ <td class="text" align="left"> : </td>
+ <td class="text" align="left"><%=nbDocsLeft%></td>
+ </tr>
+ <tr><td class="text" colspan="4" height="5" valign="top"
align="right"> </td></tr>
+ <tr><td class="text" colspan="4" height="5" valign="top"
align="right"><a
href="javascript:submitFormular('display','display');"><jahia:adminResourceBundle
resourceName="org.jahia.admin.refresh.label"/></a></td></tr>
+ </table>
+ <% } %>
</td>
</tr>
</table>
