Changeset 29543 for main

Timestamp:

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

Author:

kjdon

Message:

I went to update the solr code with the new reverse sort param, and found that it uses asc/desc internally. Also you can do a comma separated list. So, I have moved the sort order param out of sharedsolenegs2fieldsearch and into lucenesearch and solrsearch so they can have different versions of it.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/SharedSoleneGS2FieldSearch.java (modified) (5 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 = "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 +59 @@
         does_paging = true;
         does_chunking = true;
-        paramDefaults.put(SORT_ORDER_PARAM, SORT_ORDER_NORMAL);
     }
 
@@ -124 +120 @@
         /** Lucene's/Solr's rank (sort) param is based on sort fields, not ranked/not */
         createParameter(RANK_PARAM, param_list, lang);
-        createParameter(SORT_ORDER_PARAM, param_list, lang);
     }
   /** add in Lucene/SOLR specific params for AdvancedFieldQuery */
@@ -131 +126 @@
         super.addCustomQueryParamsAdvField(param_list, lang);
         createParameter(RANK_PARAM, param_list, lang);
-        createParameter(SORT_ORDER_PARAM, param_list, lang);
         
     }
@@ -162 +156 @@
             param = GSXML.createParameterDescription2(doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, param_default, fields, field_names);
             
-        } else 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)