Author: dpillot
Date: Fri Jun 15 18:45:49 2007
New Revision: 17604
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17604&repname=
=3Djahia
Log:
JAHIA-2004
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ManageContentPicker.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/impo=
rtexport/ManageContentPicker.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/importexport/ManageContentPicker.ja=
va&rev=3D17604&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ManageContentPicker.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ManageContentPicker.java Fri Jun 15 18:45:49 2007
@@ -562,9 +562,9 @@
// constructing final BIG LUCENE query
String altqueries =3D "";
=
- if (!query2.equalsIgnoreCase("")) altqueries =3D altqueries + advp=
lus + query2;
- if (!query3.equalsIgnoreCase("")) altqueries =3D altqueries + advp=
lus + query3;
- if (!query4.equalsIgnoreCase("")) altqueries =3D altqueries + advp=
lus + query4;
+ if (!query2.equalsIgnoreCase("")) altqueries =3D altqueries + quer=
y2 + advplus;
+ if (!query3.equalsIgnoreCase("")) altqueries =3D altqueries + quer=
y3 + advplus;
+ if (!query4.equalsIgnoreCase("")) altqueries =3D altqueries + quer=
y4 + advplus;
=
StringBuffer contentPickingFilterBuffer =3D new StringBuffer(256);
contentPickingFilterBuffer.append(" AND NOT (");
@@ -572,9 +572,16 @@
contentPickingFilterBuffer.append(":true) ");
=
if (!searchString.equalsIgnoreCase("") && !altqueries.equalsIgnore=
Case("")) {
- searchString =3D "(" + searchString + ")" + altqueries + conte=
ntPickingFilterBuffer.toString();
+ searchString =3Daltqueries+ "(" + searchString + ")" + content=
PickingFilterBuffer.toString();
} else if (searchString.equalsIgnoreCase("") && !altqueries.equals=
IgnoreCase("")) {
- searchString =3D altqueries.substring(altqueries.indexOf("AND =
") + 4) + contentPickingFilterBuffer.toString();
+ int i1=3D altqueries.lastIndexOf(" AND ");
+ int i2=3D altqueries.lastIndexOf(" OR ");
+ if(i1!=3D-1) {
+ searchString =3D altqueries.substring(0,i1) + contentPicki=
ngFilterBuffer.toString();
+ } else {
+ searchString =3D altqueries.substring(0,i2) + contentPicki=
ngFilterBuffer.toString();
+ }
+
} else if ( !"".equals(searchString.trim()) ){
searchString +=3D contentPickingFilterBuffer.toString();
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
