dpillot 2005/11/30 12:00:51 CET
Modified files:
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
cluster bug fix
Revision Changes Path
1.41 +25 -12
jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp.diff?r1=1.40&r2=1.41&f=h
Index: contentpick.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- contentpick.jsp 29 Nov 2005 13:12:31 -0000 1.40
+++ contentpick.jsp 30 Nov 2005 11:00:51 -0000 1.41
@@ -9,14 +9,15 @@
<%@ page import="org.jahia.registries.ServicesRegistry" %>
<%@ page import="org.jahia.services.containers.ContentContainer" %>
<%@ page import="org.jahia.services.sites.JahiaSite" %>
-<%@ page import="java.text.SimpleDateFormat" %>
+<%@ page import="org.jahia.services.sites.JahiaSitesService" %>
+<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="java.util.*" %>
<%@ taglib uri="/WEB-INF/etc/taglibs/pager-taglib" prefix="pg" %>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
<%!
-
+ private static JahiaSitesService siteService =
ServicesRegistry.getInstance().getJahiaSitesService();
private static final org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger("jsp.jahia.engines.engine");
@@ -78,7 +79,7 @@
%>
<%
/**
- * @version $Id: contentpick.jsp,v 1.40 2005/11/29 13:12:31 knguyen Exp $
+ * @version $Id: contentpick.jsp,v 1.41 2005/11/30 11:00:51 dpillot Exp $
*/
HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -93,7 +94,7 @@
String bundle_prefix = "org.jahia.engines.importexport.contentpick";
// type of object
- String objectType= (String)engineMap.get("objecttype");
+ String objectType = (String) engineMap.get("objecttype");
//parameter to order the results (def:score)
String orderBy = (String) engineMap.get("orderby");
@@ -103,7 +104,12 @@
orderBy = "score";
}
// # of virtual sites
- int sitecount = Integer.parseInt((String) engineMap.get("sitecount"));
+ int sitecount = 0;
+ try {
+ sitecount = siteService.getNbSites();
+ } catch (JahiaException e) {
+ logger.error(e);
+ }
// server path
String serverpath = "http://"; + request.getServerName() + ":" +
request.getServerPort();
String searchsite = (String) engineMap.get("searchSite");
@@ -568,9 +574,12 @@
<%
int count = 0;
- Enumeration enumeration = (Enumeration) engineMap.get("sites");
- if (sitecount > 1) {
- // looping on all sites
+ Enumeration siteEnum = null;
+ try {
+ siteEnum = siteService.getSites();
+ JahiaSite jahiaSite;
+ if (sitecount > 1) {
+ // looping on all sites
%>
<br/><%=bundle.getString(bundle_prefix +
".searchsite.allpos.label")%>
<select name="searchSite" onchange="goSearch(this.name)">
@@ -578,9 +587,9 @@
sb = new StringBuffer();
- while (enumeration.hasMoreElements()) {
+ while (siteEnum.hasMoreElements()) {
sb.append("<option value=\"");
- JahiaSite jahiaSite = (JahiaSite) enumeration.nextElement();
+ jahiaSite = (JahiaSite) siteEnum.nextElement();
sb.append(jahiaSite.getID());
sb.append("\" ");
if
(searchsite.equalsIgnoreCase(String.valueOf(jahiaSite.getID())))
sb.append("selected=\"selected\" ");
@@ -590,7 +599,7 @@
sb.append("</option>");
count++;
- }//end looping
+ }
sb.append("<option value=\"all\" ");
if (searchsite.equalsIgnoreCase("all"))
sb.append("selected=\"selected\"");
@@ -603,11 +612,15 @@
<%
} else {
// one site only
- JahiaSite jahiaSite = (JahiaSite) enumeration.nextElement();
+ jahiaSite = (JahiaSite) siteEnum.nextElement();
%>
<br/><%=bundle.getString(bundle_prefix + ".searchsite.onesite.label")%>
<b><%=jahiaSite.getSiteKey() %></b>
<input type="hidden" name="searchSite" value="<%=jahiaSite.getID() %>"/>
- <% } %>
+ <% }
+ } catch (JahiaException e) {
+ logger.error(e);
+ }
+ %>
</div>
<%
@@ -989,8 +1002,8 @@
<%
/**
* $Log: contentpick.jsp,v $
- * Revision 1.40 2005/11/29 13:12:31 knguyen
- * synch. make it compil with java 1.5
+ * Revision 1.41 2005/11/30 11:00:51 dpillot
+ * cluster bug fix
*
* Revision 1.39 2005/11/23 17:33:47 dpillot
* object type info for cp display
