Changeset 13573

Timestamp:

2007-01-11T14:44:06+13:00 (17 years ago)

Author:

kjdon

Message:

made HTIS_PER_PAGE_PARAM an int rather than an enum

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractSearch.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractSearch.java

@@ -225 +225 @@
         param = GSXML.createParameterDescription2(this.doc, INDEX_PARAM, getTextString("param."+INDEX_PARAM, lang), param_type, this.default_index, index_ids, index_names);
         param_list.appendChild(param);
-    } else if (name.equals(MAXDOCS_PARAM)) {
-            param = GSXML.createParameterDescription(this.doc, MAXDOCS_PARAM, getTextString("param."+MAXDOCS_PARAM, lang), GSXML.PARAM_TYPE_INTEGER, "10", null, null);
-    param_list.appendChild(param);
+    } else if (name.equals(MAXDOCS_PARAM) || name.equals(HITS_PER_PAGE_PARAM)) {
+        String default_val = "100";
+        if (name.equals(HITS_PER_PAGE_PARAM)) {
+        default_val = "10";
+        }
+        param = GSXML.createParameterDescription(this.doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_INTEGER, default_val, null, null);
+        param_list.appendChild(param);
     } else if (name.equals(CASE_PARAM) || name.equals(STEM_PARAM) || name.equals(ACCENT_PARAM)) {
         String[] bool_ops = {"0", "1"};
@@ -237 +241 @@
         String[] val_texts = {getTextString("param."+MATCH_PARAM+"."+MATCH_PARAM_SOME, lang), getTextString("param."+MATCH_PARAM+"."+MATCH_PARAM_ALL, lang)}; 
         param = GSXML.createParameterDescription(this.doc, MATCH_PARAM, getTextString("param."+MATCH_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, MATCH_PARAM_SOME, vals, val_texts);
-        param_list.appendChild(param);
-    } else if (name.equals(HITS_PER_PAGE_PARAM)) {
-        // hits per page
-        String [] hits_options = {"10", "30", "50"};
-        param = GSXML.createParameterDescription(this.doc, HITS_PER_PAGE_PARAM, getTextString("param."+HITS_PER_PAGE_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, "10", hits_options, hits_options);
         param_list.appendChild(param);
     } else if (name.equals(START_PAGE_PARAM)) {