dpillot 2005/10/03 17:45:30 CEST
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
bug fix
Revision Changes Path
1.26 +32 -10
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.25&r2=1.26&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ManageContentPicker.java 3 Oct 2005 15:12:39 -0000 1.25
+++ ManageContentPicker.java 3 Oct 2005 15:45:29 -0000 1.26
@@ -22,6 +22,7 @@
import org.jahia.services.importexport.ImportExportService;
import org.jahia.services.search.*;
import org.jahia.services.sites.JahiaSite;
+import org.jahia.services.sites.JahiaSitesService;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.pages.ContentPage;
import org.jahia.utils.JahiaTools;
@@ -35,7 +36,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.25 2005/10/03 15:12:39 tdraier
Exp $
+ * @version $Id: ManageContentPicker.java,v 1.26 2005/10/03 15:45:29 dpillot
Exp $
*/
public class ManageContentPicker {
private static org.apache.log4j.Logger logger =
@@ -46,6 +47,7 @@
private static ImportExportService ie;
//private static JahiaUser user;
private static JahiaSearchService searchService;
+ private static JahiaSitesService siteService;
//private static MetadataService metaservice;
private ManageContentPicker() {
@@ -61,6 +63,7 @@
// reference the useful services
ie = ServicesRegistry.getInstance().getImportExportService();
searchService = ServicesRegistry
.getInstance().getJahiaSearchService();
+ siteService=
ServicesRegistry.getInstance().getJahiaSitesService();
logger.debug("creating instance");
}
return instance;
@@ -93,7 +96,8 @@
//JahiaUser user = processingContext.getUser ();
logger.debug("loading mode");
engineMap.put("fieldsEditCallingEngineName", "contentpick_engine");
- engineMap.put("adminAccess", Boolean.TRUE);
+ //engineMap.put("adminAccess", Boolean.TRUE);
+
//check if we just need a sort on previous results
String o = processingContext.getParameter("orderby");
//o not null nor empty,lasto exist, o!=lasto, results not null
@@ -153,17 +157,27 @@
return false;
}
+ /**
+ * internal method to do the search
+ * @param object
+ * @param processingContext
+ * @param engineMap
+ * @throws Exception
+ */
private void doSearch(ContentObject object, ProcessingContext
processingContext, HashMap engineMap)
throws Exception {
- //ImportExportService ie =
ServicesRegistry.getInstance().getImportExportService();
- Enumeration sites =
ServicesRegistry.getInstance().getJahiaSitesService().getSites();
+
+
+ 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("search");
+ String searchString = (String)
processingContext.getParameter("query");
if (searchString == null) {
searchString = "";
logger.warn("searching string is empty");
@@ -171,15 +185,20 @@
//orderby parameter
String orderBy = (String) processingContext.getParameter("orderby");
- if (orderBy == null) orderBy = "score";
+ if (orderBy == null) {
+ orderBy = "score";
+ logger.warn("order set on default score");
+ }
//domain scope
String scope = (String) processingContext.getParameter("searchSite");
- if (scope == null) scope = "all";
+ if (scope == null && siteService.getNbSites()>1) scope = "all";
+ else if (siteService.getNbSites()==1)
scope=""+siteService.getSite(((JahiaSite)siteService.getSites().nextElement()).getID());
+
+ logger.debug("[init parameters from request: orderby:" + orderBy
+ +" searchstring:" + searchString
+ +" searchSite:" + scope+ " ---------------]");
- logger.debug("orderby:" + orderBy);
- logger.debug("searchstring:" + searchString);
- logger.debug("searchSite:" + scope);
//store all the params for subsequent requests
engineMap.put("searchString", searchString);
@@ -429,6 +448,9 @@
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.26 2005/10/03 15:45:29 dpillot
+ * bug fix
+ *
* Revision 1.25 2005/10/03 15:12:39 tdraier
* link on subpage in content picker results
*
