Changeset 28181 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractTextSearch.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/AbstractTextSearch.java (modified) (5 diffs)

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

@@ -60 +60 @@
     public AbstractTextSearch()
     {
+      super();
         // the search service
         QUERY_SERVICE = "TextQuery";
+        paramDefaults.put(CASE_PARAM, BOOLEAN_PARAM_ON);
+        paramDefaults.put(STEM_PARAM, BOOLEAN_PARAM_OFF);
+        paramDefaults.put(ACCENT_PARAM, BOOLEAN_PARAM_ON);
+        paramDefaults.put(MATCH_PARAM, MATCH_PARAM_SOME);
     }
 
@@ -87 +92 @@
         Element param = null;
         String param_default = default_value;
+        if (default_value == null) {
+          // have we got a stored up default? will be null if not there
+          param_default = paramDefaults.get(name);
+        }
 
         if (super.createParameterChain(name, param_list, lang, default_value))
@@ -94 +103 @@
         }
         // otherwise look to see if it is a text specific parameter
-        else if (name.equals(INDEX_SUBCOLLECTION_PARAM))
+        if (name.equals(INDEX_SUBCOLLECTION_PARAM))
         {
             Element index_sub_list = (Element) GSXML.getChildByTagName(this.config_info, INDEX_SUBCOLLECTION_ELEM + GSXML.LIST_MODIFIER);
@@ -137 +146 @@
         }
     else if (name.equals(CASE_PARAM) || name.equals(STEM_PARAM) || name.equals(ACCENT_PARAM)) {
-      if (param_default == null) {
-        param_default = BOOLEAN_PARAM_OFF;
-      }
         String[] bool_ops = {"0", "1"};
         String[] bool_texts = {getTextString("param.boolean.off", lang),getTextString("param.boolean.on", lang)}; 
@@ -146 +152 @@
         return true;
     } else if (name.equals(MATCH_PARAM)) {
-      if (param_default == null) {
-        param_default = MATCH_PARAM_SOME;
-      }
       
         String[] vals = {MATCH_PARAM_SOME, MATCH_PARAM_ALL };