dpillot 2005/11/30 12:01:28 CET
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
cluster bug fix
Revision Changes Path
1.54 +12 -5
jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java.diff?r1=1.53&r2=1.54&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ManageContentPicker.java 25 Nov 2005 11:24:55 -0000 1.53
+++ ManageContentPicker.java 30 Nov 2005 11:01:28 -0000 1.54
@@ -42,7 +42,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.53 2005/11/25 11:24:55 dpillot
Exp $
+ * @version $Id: ManageContentPicker.java,v 1.54 2005/11/30 11:01:28 dpillot
Exp $
*/
public class ManageContentPicker {
private static org.apache.log4j.Logger logger =
@@ -201,11 +201,13 @@
throws Exception {
//domain scope
+
Enumeration sites = siteService.getSites();
+ /*
int siteCount = siteService.getNbSites();
engineMap.put("sitecount", "" + siteCount);
engineMap.put("sites", sites);
-
+ */
//get all parameters
// main query
String searchString = (String)
processingContext.getParameter("query");
@@ -430,7 +432,7 @@
if (scope == null && siteService.getNbSites() > 1) scope = "all";
//default
else if (siteService.getNbSites() == 1) {
int siteid= ((JahiaSite)
siteService.getSites().nextElement()).getID();
- scope = "" + siteid;
+ scope = String.valueOf(siteid) ;
logger.debug("siteid:"+siteid);
}
@@ -460,7 +462,7 @@
}
//summary
logger.warn("[init parameters from request: "
- + " searchSite:" + scope + " on " + siteCount + " sites"
+ + " searchSite:" + scope
+ " ordered by:" + orderBy
+ "[------- searchstring:"+searchString+"
---------------]");
@@ -480,7 +482,7 @@
if (!"".equals(searchString)) {
JahiaSearchResultBuilder resultBuilder = new
ContainerSearchResultBuilderImpl();
searchString=searchString.trim();
-
+ // unused
if (searchString.startsWith("page:")) {
logger.debug("searching for page:"+searchString);
int pageId =
Integer.parseInt(searchString.substring(5,searchString.indexOf(" ")));
@@ -529,8 +531,10 @@
logger.debug(strings);
//recreate enum
+ /*
sites = siteService.getSites();
engineMap.put("sites", sites);
+ */
searchResults = searchService.search(strings,
searchString, processingContext, languageCodes, resultBuilder);
} else {
//just one domain search
@@ -861,6 +865,9 @@
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.54 2005/11/30 11:01:28 dpillot
+ * cluster bug fix
+ *
* Revision 1.53 2005/11/25 11:24:55 dpillot
* return valid or staging results
*
