Changeset 29558 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2LuceneSearch.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/GS2LuceneSearch.java (modified) (6 diffs)

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

@@ -41 +41 @@
 public class GS2LuceneSearch extends SharedSoleneGS2FieldSearch
 {
+
   protected static final String SORT_ORDER_PARAM = "reverseSort";
   protected static final String SORT_ORDER_REVERSE = "1";
@@ -51 +52 @@
     public GS2LuceneSearch()
     {
+      does_paging = true;
         paramDefaults.put(SORT_ORDER_PARAM, SORT_ORDER_NORMAL);
         this.lucene_src = new GS2LuceneQuery();
@@ -98 +100 @@
     
   }
+   
     /** methods to handle actually doing the query */
 
@@ -108 +111 @@
         String physical_index_language_name = null;
         String physical_sub_index_name = null;
-        int maxdocs = Integer.parseInt(paramDefaults.get(MAXDOCS_PARAM));
         int hits_per_page = Integer.parseInt(paramDefaults.get(HITS_PER_PAGE_PARAM));
         int start_page = Integer.parseInt(paramDefaults.get(START_PAGE_PARAM));
         String sort_field = getLuceneSort(default_sort);
         String sort_order = paramDefaults.get(SORT_ORDER_PARAM);
+           
         // set up the query params
         Set entries = params.entrySet();
@@ -122 +125 @@
             String value = (String) m.getValue();
 
-            if (name.equals(MAXDOCS_PARAM) && !value.equals(""))
-            {
-                maxdocs = Integer.parseInt(value);
-            }
-            else if (name.equals(HITS_PER_PAGE_PARAM))
-            {
-                hits_per_page = Integer.parseInt(value);
+            if (name.equals(HITS_PER_PAGE_PARAM))
+            {
+              if (value.equals("all")) {
+                hits_per_page = -1;
+              } else {
+                hits_per_page = Integer.parseInt(value);
+              }
             }
             else if (name.equals(START_PAGE_PARAM))
@@ -177 +180 @@
         // set up start and end results if necessary
         int start_results = 1;
-        if (start_page != 1)
+        if (start_page > 1 && hits_per_page > 0)
         {
             start_results = ((start_page - 1) * hits_per_page) + 1;
         }
-        int end_results = hits_per_page * start_page;
+        int end_results = Integer.MAX_VALUE;
+        if (hits_per_page > 0) {
+          end_results = hits_per_page * start_page;
+        }
         this.lucene_src.setStartResults(start_results);
         this.lucene_src.setEndResults(end_results);