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

Timestamp:

2013-08-29T15:03:53+12:00 (11 years ago)

Author:

kjdon

Message:

making search param defaults able to be set in config file. uses <paramDefault name=xx value=yy> element. Now all defaults are set in paramDefaults HashMap instead of individual variables. have left index etc ones for now as they are more complicated.

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

@@ -46 +46 @@
     protected SharedSoleneQuery solene_src = null;
 
+  
     public SharedSoleneGS2FieldSearch()
     {
+      super();
         // Lucene/Solr uses double operators, not single
         AND_OPERATOR = "&&";
@@ -54 +56 @@
         does_paging = true;
         does_chunking = true;
+        paramDefaults.put(SORT_ORDER_PARAM, SORT_ORDER_DESCENDING);
     }
 
@@ -67 +70 @@
         Element config_search = (Element) GSXML.getChildByTagName(extra_info, GSXML.SEARCH_ELEM);
         Document owner = info.getOwnerDocument();
-        // get out the sort fields
+        // find the sort fields in serviceRack xml, and add in the deisplayItems if any
         NodeList sort_nodes = info.getElementsByTagName(SORT_ELEM);
 
@@ -115 +118 @@
     {
         Element param = null;
+        String param_default = paramDefaults.get(name);
         if (name.equals(RANK_PARAM))
         {
@@ -120 +124 @@
             ArrayList<String> fields = new ArrayList<String>();
             ArrayList<String> field_names = new ArrayList<String>();
-            if (getSortData(fields, field_names, lang)) {
-
-              param = GSXML.createParameterDescription2(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, fields.get(0), fields, field_names);
+            if (!getSortData(fields, field_names, lang)) {
+              fields.add(RANK_PARAM_RANK);
+              fields.add(RANK_PARAM_NONE);
+              field_names.add(getTextString("param." + RANK_PARAM + "." + RANK_PARAM_RANK, lang));
+              field_names.add(getTextString("param." + RANK_PARAM + "." + RANK_PARAM_NONE, lang));
             }
+            
+            param = GSXML.createParameterDescription2(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, fields.get(0), fields, field_names);
+            
         } 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) };
 
-        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);
+        param = GSXML.createParameterDescription(this.doc, SORT_ORDER_PARAM, getTextString("param." + SORT_ORDER_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, SORT_ORDER_DESCENDING, vals, vals_texts);
       }