Changeset 29541 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/SharedSoleneGS2FieldSearch.java

Timestamp:

2014-12-08T10:24:18+13:00 (9 years ago)

Author:

kjdon

Message:

changed sort order param to reverse sort param. matches better what lucene/solr actually do, and removes the issue of needing a different default sort order when sorting by rank vs other field.

File:

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

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

@@ -41 +41 @@
   protected static final String SORT_ELEM = "sort";
   protected static final String DEFAULT_SORT_ELEM = "defaultSort";
-  protected static final String SORT_ORDER_PARAM = "sortOrder";
-  protected static final String SORT_ORDER_DESCENDING = "1";
-  protected static final String SORT_ORDER_ASCENDING = "0";
+  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.SharedSoleneGS2FieldSearch.class.getName());
@@ -62 +62 @@
         does_paging = true;
         does_chunking = true;
-        paramDefaults.put(SORT_ORDER_PARAM, SORT_ORDER_DESCENDING);
+        paramDefaults.put(SORT_ORDER_PARAM, SORT_ORDER_NORMAL);
     }
 
@@ -163 +163 @@
             
         } else 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) };
+        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);