Changeset 26360

Timestamp:

2012-10-19T18:50:46+13:00 (10 years ago)

Author:

ak19

Message:

Searching on all fields has changed. Previously searching over all fields was to be specified without any index field prefixed to the query. Now, searching over all fields requires the foxml.all.text index field to be prefixed to the query.

Location:

other-projects/gs3-webservices-java-client/trunk

Files:

• lib/fedoraGS3.jar (modified) ( previous)
• src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java (modified) (1 diff)
• src/GS3Fedora/org/greenstone/fedora/services/GSearchConnection.java (modified) (3 diffs)

other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java

@@ -2189 +2189 @@
         // Params to search() method below: string of fielded query terms;  
         // hitpageStart, hitpageEnd, snippetsMax (leave that 0)
-        query = query + " " + "PID" + COLON + GREENSTONE;
+        query = GSearchConnection.ALL_INDEXED_FIELDS + COLON + query + " " + "PID" + COLON + GREENSTONE;
         
         String searchResult = this.fedoraGSearch.search(query, 1, maxDocs, 0);

other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/GSearchConnection.java

@@ -74 +74 @@
     protected static final String DC_TITLE_FIELD = "dc.title";
     protected static final String FULLTEXT_FIELD = "ds.fulltext";
+    public static final String ALL_INDEXED_FIELDS = "foxml.all.text";
     
     /** separator used internally to separate values of a search field */ 
@@ -291 +292 @@
         // and put quotes around phrases, then combine all the terms
         // together again with spaces to separate them.
-        allfields = formatSearchTermsInField(allfields, ALL_FIELDS); // search foxml.all.text
+        allfields = formatSearchTermsInField(allfields, ALL_FIELDS); // searches foxml.all.text
             // ALL_FIELDS has no field name
         titles = formatSearchTermsInField(titles, DC_TITLE_FIELD);
@@ -349 +350 @@
             if(!fieldName.equals(ALL_FIELDS)) { 
                 field = fieldName + ":" + field;
+            } 
+            // in older versions of GSearch (version 2.2), searching over all fields 
+            // meant not specifying an index to search in. From GSearch version 2.4/2.5
+            // need to search in field "foxml.all.text" to search all indexed fields.
+            else {
+                field = ALL_INDEXED_FIELDS + ":" + field; //searches in foxml.all.text
             }