Changeset 29558 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java

Timestamp:

2014-12-08T14:46:32+13:00 (9 years ago)

Author:

kjdon

Message:

work around does_paging, does_chunking. only add in maxdocs, hitsperpage params if the service actually uses them. lucnee/solr, don't use maxdocs any more. I haven't had a chance to clean up the changes, but I need to commit, so there may be extraneous debug statements still here.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java

@@ -328 +328 @@
 
                 addCustomQueryParams(param_list, lang);
-                createParameter(MAXDOCS_PARAM, param_list, lang);
                 if (!default_index_subcollection.equals(""))
                 {
@@ -338 +337 @@
                 }
 
+                if (does_chunking) {
+                  createParameter(MAXDOCS_PARAM, param_list, lang);
+                }
                 if (does_paging)
                 {
@@ -361 +363 @@
             {
                 addCustomQueryParamsAdvField(param_list, lang);
-                createParameter(MAXDOCS_PARAM, param_list, lang);
                 if (!default_index_subcollection.equals(""))
                 {
@@ -394 +395 @@
                 {
                     createParameter(FIELD_ACCENT_PARAM, multiparam, lang);
+                }
+                if (does_chunking) {
+                  createParameter(MAXDOCS_PARAM, param_list, lang);
                 }
                 if (does_paging)
@@ -673 +677 @@
 
         // add a metadata item to specify docs returned
-        int docs_returned = docs.length;
-        if (does_paging)
-        {
+        if (does_chunking) // this means we have a max docs param, and might ask for only a subset of results
+        {
+          logger.error("does_chunking = true");
+                int docs_returned = docs.length;
             String maxdocs_str = (String) params.get(MAXDOCS_PARAM);
             if (maxdocs_str != null)
             {
                 int maxdocs = Integer.parseInt(maxdocs_str);
-                docs_returned = (maxdocs < (int) totalDocs ? maxdocs : (int) totalDocs);
-            }
-        }
-        GSXML.addMetadata(metadata_list, "numDocsReturned", "" + docs_returned);
+                if (maxdocs > 0) { // maxdocs==-1 means return all
+                  docs_returned = (maxdocs < (int) totalDocs ? maxdocs : (int) totalDocs);
+                }
+            }
+            GSXML.addMetadata(metadata_list, "numDocsReturned", "" + docs_returned);
+        }
+        
 
         // add a metadata item to specify what actual query was done - eg if stuff was stripped out etc. and then we can use the query later, cos we don't know which parameter was the query