knguyen 2005/05/18 15:54:23 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/views/jsp/jahia/administration/search main.jsp
src/views/jsp/jahia/administration/search/include index.jsp
indexresult.jsp
operations.jsp
Added files: (Branch: JAHIA-4-1-BRANCH)
src/views/jsp/jahia/administration/search/include
abortindexation.jsp
abortindexationresult.jsp
status.jsp
Log:
- put full indexation of site in scheduled job.
- remove server full lock when indexing a site
Revision Changes Path
1.1.2.1 +69 -0
jahia/src/views/jsp/jahia/administration/search/include/abortindexation.jsp
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/administration/search/include/abortindexation.jsp?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +68 -0
jahia/src/views/jsp/jahia/administration/search/include/abortindexationresult.jsp
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/administration/search/include/abortindexationresult.jsp?rev=1.1.2.1&content-type=text/plain
1.10.6.1 +1 -1
jahia/src/views/jsp/jahia/administration/search/include/index.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/administration/search/include/index.jsp.diff?r1=1.10&r2=1.10.6.1&f=h
1.8.6.1 +1 -1
jahia/src/views/jsp/jahia/administration/search/include/indexresult.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/administration/search/include/indexresult.jsp.diff?r1=1.8&r2=1.8.6.1&f=h
1.9.6.1 +20 -1
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&r2=1.9.6.1&f=h
1.1.2.1 +51 -0
jahia/src/views/jsp/jahia/administration/search/include/status.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/administration/search/include/status.jsp?rev=1.1.2.1&content-type=text/plain
1.13.4.1 +2 -2 jahia/src/views/jsp/jahia/administration/search/main.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/administration/search/main.jsp.diff?r1=1.13&r2=1.13.4.1&f=h
Index: main.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/administration/search/Attic/main.jsp,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- main.jsp 4 Mar 2004 16:50:16 -0000 1.13
+++ main.jsp 18 May 2005 13:54:22 -0000 1.13.4.1
@@ -12,8 +12,8 @@
includes.setProperty("operations","/jsp/jahia/administration/search/include/operations.jsp");
includes.setProperty("index","/jsp/jahia/administration/search/include/index.jsp");
includes.setProperty("indexresult","/jsp/jahia/administration/search/include/indexresult.jsp");
-
includes.setProperty("optimize","/jsp/jahia/administration/search/include/optimize.jsp");
-
includes.setProperty("optimizeresult","/jsp/jahia/administration/search/include/optimizeresult.jsp");
+
includes.setProperty("abortindexation","/jsp/jahia/administration/search/include/abortindexation.jsp");
+
includes.setProperty("abortindexationresult","/jsp/jahia/administration/search/include/abortindexationresult.jsp");
includes.setProperty("error","/jsp/jahia/administration/search/include/error.jsp");
request.setAttribute("includes",includes);
Index: index.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/administration/search/include/Attic/index.jsp,v
retrieving revision 1.10
retrieving revision 1.10.6.1
diff -u -r1.10 -r1.10.6.1
--- index.jsp 9 Sep 2003 13:57:57 -0000 1.10
+++ index.jsp 18 May 2005 13:54:23 -0000 1.10.6.1
@@ -72,7 +72,7 @@
</td>
<td align="right">
<br><br><br>
- <a href="javascript:submitFormular('<%=subAction%>','ok');"
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('ok','','<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.okOn.button"/>',1)"
onclick="openWorkInProgressWindow('<%=request.getContextPath()%>')"><img
name="ok" src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.okOff.button"/>" width="69" height="17" border="0"></a>
+ <a href="javascript:submitFormular('<%=subAction%>','ok');"
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('ok','','<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.okOn.button"/>',1)" ><img name="ok"
src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.okOff.button"/>" width="69" height="17" border="0"></a>
</td>
</tr>
Index: indexresult.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/administration/search/include/Attic/indexresult.jsp,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -r1.8 -r1.8.6.1
--- indexresult.jsp 9 Sep 2003 13:57:57 -0000 1.8
+++ indexresult.jsp 18 May 2005 13:54:23 -0000 1.8.6.1
@@ -22,7 +22,7 @@
<tr>
<td class="text" colspan="2">
<font size="3">
- <b><jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.theSiteReIndexed.label"/>.</b>
+ <b><jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.indexOptimizSiteIndexingIsRunning.label"/>.</b>
</font>
<br><br><br>
</td>
Index: operations.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/administration/search/include/Attic/operations.jsp,v
retrieving revision 1.9
retrieving revision 1.9.6.1
diff -u -r1.9 -r1.9.6.1
--- operations.jsp 9 Sep 2003 13:57:57 -0000 1.9
+++ operations.jsp 18 May 2005 13:54:23 -0000 1.9.6.1
@@ -1,6 +1,8 @@
<[EMAIL PROTECTED] import = "java.util.*" %>
+
<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia" %>
<[EMAIL PROTECTED] import="org.jahia.bin.*"%>
+<[EMAIL PROTECTED] import="org.jahia.services.search.*"%>
<jsp:useBean id="url" class="java.lang.String"
scope="request"/> <% // http files path. %>
<jsp:useBean id="input" class="java.lang.String"
scope="request"/> <% // inputs size. %>
@@ -10,6 +12,13 @@
<%
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");
+ boolean siteIndexationIsRunningInBackground = false;
+ if ( indJob != null ){
+ siteIndexationIsRunningInBackground = !indJob.isDone();
+ }
+
%>
<table border="0" width="100%" cellpadding="0" cellspacing="0">
@@ -50,11 +59,21 @@
<td class="text" align="left">
<input type="radio" name="operation" value="doindex" <% if
(operation.equals("doindex")) {%>checked<%}%>><jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.reIndexAndOptimize.label"/>.<br><br>
<% if ( indexExists.booleanValue() ) { %>
- <input type="radio" name="operation" value="dooptimize" <%
if (operation.equals("dooptimize")) {%>checked<%}%>><jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.optimizeSearch.label"/>.
+ <!--<input type="radio" name="operation" value="dooptimize"
<% if (operation.equals("dooptimize"))
{%>checked<%}%>><jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.optimizeSearch.label"/>.-->
+ <% } %>
+ <% if ( siteIndexationIsRunningInBackground ) { %>
+ <input type="radio" name="operation" value="abortIndexation"
<% if (operation.equals("abortIndexation"))
{%>checked<%}%>><jahia:adminResourceBundle
resourceName="org.jahia.admin.search.ManageSearch.abortIndexation.label"/>.
<% } %>
</td>
</tr>
<tr>
+ <td class="text" colspan="2" align="left">
+ <!-- include page start -->
+ <jsp:include
page="/jsp/jahia/administration/search/include/status.jsp" flush="true"/>
+ <!-- include page ends -->
+ </td>
+ </tr>
+ <tr>
<td align="right" colspan="2">
<br><br><br>
<%if(!isLynx.booleanValue()){%>
