Changeset 30476

Timestamp:

2016-04-14T13:50:01+12:00 (8 years ago)

Author:

kjdon

Message:

the property file to look up has changed with the new rearrangement of servie rack property files

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• action/QueryAction.java (modified) (1 diff)
• service/AbstractGS2FieldSearch.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java

@@ -366 +366 @@
   protected boolean addHitsParamToService(Document doc, Element service_description, String lang) {
     Element param_list = (Element)GSXML.getChildByTagName(service_description, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    Element param = GSXML.createParameterDescription(doc, HITS_PER_PAGE, getTextString("param." + HITS_PER_PAGE, lang, "AbstractSearch", null), GSXML.PARAM_TYPE_INTEGER, "20", null, null);
+    Element param = GSXML.createParameterDescription(doc, HITS_PER_PAGE, getTextString("param." + HITS_PER_PAGE, lang, "ServiceRack", null), GSXML.PARAM_TYPE_INTEGER, "20", null, null);
     Element query_param = GSXML.getNamedElement(param_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT, "query");
     if (query_param != null) {

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

@@ -495 +495 @@
         {
             String[] bool_ops = { "0", "1" };
-            String[] bool_texts = { getTextString("param.boolean.off", lang, "AbstractTextSearch"), getTextString("param.boolean.on", lang, "AbstractTextSearch") };
+            String[] bool_texts = { getTextString("param.boolean.off", lang), getTextString("param.boolean.on", lang) };
             param = GSXML.createParameterDescription(doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_BOOLEAN, param_default, bool_ops, bool_texts);