dpillot 2005/12/06 15:07:39 CET
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
avoid to have empty results frame at init phase + some minor fix
Revision Changes Path
1.59 +9 -3
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.58&r2=1.59&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ManageContentPicker.java 6 Dec 2005 09:05:48 -0000 1.58
+++ ManageContentPicker.java 6 Dec 2005 14:07:39 -0000 1.59
@@ -41,7 +41,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.58 2005/12/06 09:05:48
cmailleux Exp $
+ * @version $Id: ManageContentPicker.java,v 1.59 2005/12/06 14:07:39 dpillot
Exp $
*/
public class ManageContentPicker {
private static final org.apache.log4j.Logger logger =
@@ -116,13 +116,14 @@
//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
- logger.debug("o=" + o + " lasto=" + engineMap.get("orderby"));
+
if (o != null
&& !o.equalsIgnoreCase("")
&& engineMap.containsKey("orderby")
&& !o.equalsIgnoreCase((String) engineMap.get("orderby"))
&& engineMap.get("searchResults") != null
) {
+ logger.debug("o=" + o + " lasto=" + engineMap.get("orderby"));
orderBy(o, engineMap, true);
//engineMap.remove("orderby");
engineMap.put("orderby", o);
@@ -214,7 +215,7 @@
String query1 = searchString;
// to remap a numeric input in PIDs
- if (StringUtils.isNumeric(searchString)) {
+ if (!searchString.equalsIgnoreCase("") &&
StringUtils.isNumeric(searchString)) {
//used to get a pid directly from the main request assuming
number is pid number
searchString = "jahia.page_id:" +
NumberPadding.pad(searchString);
isPID = true;
@@ -761,8 +762,10 @@
//sorting
orderBy(orderBy, engineMap, myResults, results, true);
+ return;
}
+ engineMap.put("searchResults", null);
}
private List getChildFieldsOnly(List childs) {
@@ -902,6 +905,9 @@
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.59 2005/12/06 14:07:39 dpillot
+ * avoid to have empty results frame at init phase + some minor fix
+ *
* Revision 1.58 2005/12/06 09:05:48 cmailleux
* Use scope instead of seraching again in processing context the searchSite
*
