Changeset 28029

Timestamp:

2013-08-13T13:27:27+12:00 (11 years ago)

Author:

kjdon

Message:

moved some stuff back to super class. setting reverse_sort is different for whether sorting is by rank/field

File:

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

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

@@ -38 +38 @@
 public class GS2LuceneSearch extends SharedSoleneGS2FieldSearch
 {
-
-  protected static final String SORT_ORDER_PARAM = "sortOrder";
-  protected static final String SORT_ORDER_DESCENDING = "1";
-  protected static final String SORT_ORDER_ASCENDING = "0";
-
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.GS2LuceneSearch.class.getName());
 
@@ -58 +53 @@
     }
 
-    /** add in the Lucene specific params to TextQuery */
-    protected void addCustomQueryParams(Element param_list, String lang)
-    {
-        super.addCustomQueryParams(param_list, lang);
-        /** Lucene's/Solr's rank param is based on index fields, not ranked/not */
-        createParameter(SORT_ORDER_PARAM, param_list, lang);
-    }
-  
-  /** create a param and add to the list */
-  protected void createParameter(String name, Element param_list, String lang)
-    {
-      Element param = null;
-      if (name.equals(SORT_ORDER_PARAM)) {
-        String[] vals = { SORT_ORDER_ASCENDING, SORT_ORDER_DESCENDING };
-        String[] vals_texts = { getTextString("param." + SORT_ORDER_PARAM + "." + SORT_ORDER_ASCENDING, lang), getTextString("param." + SORT_ORDER_PARAM + "." + SORT_ORDER_DESCENDING, lang) };
-
-        param = GSXML.createParameterDescription(this.doc, SORT_ORDER_PARAM, getTextString("param." + SORT_ORDER_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, SORT_ORDER_ASCENDING, vals, vals_texts);
-      }
-      
-      if (param != null)
-        {
-          param_list.appendChild(param);
-        }
-      else
-        {
-          super.createParameter(name, param_list, lang);
-        }
-    }
     /** methods to handle actually doing the query */
 
@@ -99 +66 @@
         int hits_per_page = 20;
         int start_page = 1;
+        String sort_field = GS2LuceneQuery.SORT_RANK;
+        String sort_order = SORT_ORDER_ASCENDING;
         // set up the query params
         Set entries = params.entrySet();
@@ -134 +103 @@
             else if (name.equals(RANK_PARAM))
             {
-                if (value.equals(RANK_PARAM_RANK_VALUE))
-                {
-                    value = null;
+                if (value.equals(RANK_PARAM_RANK))
+                {
+                    value = GS2LuceneQuery.SORT_RANK;
+                } else if (value.equals(RANK_PARAM_NONE)) {
+                  value = GS2LuceneQuery.SORT_NATURAL;
                 }
                 this.lucene_src.setSortField(value);
+                sort_field = value;
             }
             else if (name.equals(SORT_ORDER_PARAM)) {
-                if (value.equals(SORT_ORDER_DESCENDING)) {
-                  this.lucene_src.setReverseSort();
-                }
-              }
+              sort_order = value;
+            }
             else if (name.equals(LEVEL_PARAM))
             {
@@ -187 +157 @@
         }
 
+        // default order for rank is descending, while for other
+        // fields it is ascending. So reverse_sort is different for
+        // the two cases.
+        if (sort_field.equals(GS2LuceneQuery.SORT_RANK)) {
+          if (sort_order.equals(SORT_ORDER_ASCENDING)) {
+            this.lucene_src.setReverseSort(true);
+          } else {
+            this.lucene_src.setReverseSort(false);
+          }
+        } else {
+          if (sort_order.equals(SORT_ORDER_DESCENDING)) {
+            this.lucene_src.setReverseSort(true);
+          } else {
+            this.lucene_src.setReverseSort(false);
+          }
+        }
         this.lucene_src.setIndexDir(indexdir + index);
         this.lucene_src.initialise();