Author: sshyrkov
Date: Fri Nov 9 10:45:56 2007
New Revision: 19094
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19094&repname=
=3Djahia
Log:
[trunk r19053] MIN-367: fix query and ordering by score in ContentPicking.
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/impor=
texport/ManageContentPicker.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines=
/importexport/ManageContentPicker.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/engines/importexport/ManageContentPick=
er.java&rev=3D19094&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/impor=
texport/ManageContentPicker.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/impor=
texport/ManageContentPicker.java Fri Nov 9 10:45:56 2007
@@ -554,6 +554,8 @@
searchString =3D "\"" + searchString + "\"";
} else if (smode.equalsIgnoreCase("and") && !searchString.equalsIg=
noreCase("")) {
searchString =3D searchString.trim().replaceAll("\\s", " AND "=
);
+ } else if ( !searchString.equals("") ){
+ searchString =3D " (" + searchString + ") ";
}
=
//adding advanced queries
@@ -1055,7 +1057,13 @@
if (!order) o =3D -1;
// possibly metadata could be null
if (metadata1 =3D=3D null && metadata2 !=3D null) return (=
-1 * o);
- if (metadata2 =3D=3D null) return o;//catch m1=3Dm2=3Dnull
+ if (metadata2 =3D=3D null) {
+ //equality case (use the score)
+ if (sc1 <=3D sc2)
+ return o;// second object is less than 1st
+ else
+ return (-1 * o); //opposite
+ }
=
//comparaison
if (metadata1.equalsIgnoreCase(metadata2)) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
