Author: knguyen
Date: Mon Nov 5 17:04:31 2007
New Revision: 19047
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19047&repname=
=3Djahia
Log:
fix JAHIA-2607:fix issues that prevent limiting search to only Field of typ=
e FileField.
Modified:
trunk/core/src/java/org/jahia/services/search/ContainerSearcher.java
trunk/core/src/java/org/jahia/services/search/valves/FieldSearchIndexPr=
ocessValveImpl.java
Modified: trunk/core/src/java/org/jahia/services/search/ContainerSearcher.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/search/ContainerSearcher.java&rev=3D19047&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
--- trunk/core/src/java/org/jahia/services/search/ContainerSearcher.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/services/search/ContainerSearcher.java Mo=
n Nov 5 17:04:31 2007
@@ -328,8 +328,9 @@
} else {
queryStr =3D this.getQuery();
}
- queryStr +=3D " AND " + JahiaSearchConstant.CONTENT_TYPE + ":"
- + JahiaSearchConstant.CONTAINER_TYPE;
+ queryStr +=3D " AND " + JahiaSearchConstant.CONTENT_TYPE + ":(=
"
+ + JahiaSearchConstant.CONTAINER_TYPE
+ + " " + JahiaSearchConstant.FIELD_FIELDTYPE + ")";
=
if (!isSiteModeSearching ()) {
buff.append (" (");
Modified: trunk/core/src/java/org/jahia/services/search/valves/FieldSearchI=
ndexProcessValveImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/search/valves/FieldSearchIndexProcessValveImpl.java&rev=
=3D19047&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
--- trunk/core/src/java/org/jahia/services/search/valves/FieldSearchIndexPr=
ocessValveImpl.java (original)
+++ trunk/core/src/java/org/jahia/services/search/valves/FieldSearchIndexPr=
ocessValveImpl.java Mon Nov 5 17:04:31 2007
@@ -160,8 +160,8 @@
try {
if ( field instanceof JahiaFileFieldWrapper ){
values =3D fillDocumentWithFileField(contextMap,field,doc);
- doc.setFieldValues(field.getDefinition().getName(),values);
- doc.getField(field.getDefinition().getName())
+ doc.setFieldValues(JahiaSearchConstant.CONTAINER_FIELD_PRE=
FIX + field.getDefinition().getName(),values);
+ doc.getField(JahiaSearchConstant.CONTAINER_FIELD_PREFIX + =
field.getDefinition().getName())
.setType(DocumentField.UNSTORED_TEXT);
} else {
values =3D field.getValuesForSearch(field.getLanguageCode(=
),context);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
