Changeset 29544 for main

Timestamp:

2014-12-08T11:23:09+13:00 (9 years ago)

Author:

kjdon

Message:

sort order param is now reversesort, and moved here instead of in sharedsolene..

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2LuceneSearch.java (modified) (4 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";
+  protected static final String SORT_ORDER_NORMAL = "0";
+
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.GS2LuceneSearch.class.getName());
 
@@ -47 +51 @@
     public GS2LuceneSearch()
     {
+        paramDefaults.put(SORT_ORDER_PARAM, SORT_ORDER_NORMAL);
         this.lucene_src = new GS2LuceneQuery();
     }
@@ -56 +61 @@
     }
 
+    /** add in the Lucene specific params to TextQuery */
+    protected void addCustomQueryParams(Element param_list, String lang)
+    {
+        super.addCustomQueryParams(param_list, lang);
+        /** Add in the reverse sort on/off param */
+        createParameter(SORT_ORDER_PARAM, param_list, lang);
+    }
+  /** add in Lucene specific params for AdvancedFieldQuery */
+  protected void addCustomQueryParamsAdvField(Element param_list, String lang)
+    {
+        super.addCustomQueryParamsAdvField(param_list, lang);
+        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)
+  {
+    Document doc = param_list.getOwnerDocument();
+    Element param = null;
+    String param_default = paramDefaults.get(name);
+    if (name.equals(SORT_ORDER_PARAM)) {
+        String[] vals = { SORT_ORDER_REVERSE, SORT_ORDER_NORMAL };
+        String[] vals_texts = { getTextString("param." + SORT_ORDER_PARAM + "." + SORT_ORDER_REVERSE, lang), getTextString("param." + SORT_ORDER_PARAM + "." + SORT_ORDER_NORMAL, lang) };
+
+        param = GSXML.createParameterDescription(doc, SORT_ORDER_PARAM, getTextString("param." + SORT_ORDER_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, param_default, vals, vals_texts);
+    }
+
+    if (param != null)
+      {
+    param_list.appendChild(param);
+      }
+    else
+      {
+    super.createParameter(name, param_list, lang);
+      }
+    
+  }
     /** methods to handle actually doing the query */
 
@@ -155 +197 @@
         }
 
-        // 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);
-          }
+        if (sort_order.equals(SORT_ORDER_REVERSE)) {
+          this.lucene_src.setReverseSort(true);
         } else {
-          if (sort_order.equals(SORT_ORDER_DESCENDING)) {
-            this.lucene_src.setReverseSort(true);
-          } else {
-            this.lucene_src.setReverseSort(false);
-          }
+          this.lucene_src.setReverseSort(false);
         }
         this.lucene_src.setIndexDir(indexdir + index);