Changeset 9281

Timestamp:

2005-03-04T15:27:22+13:00 (19 years ago)

Author:

kjdon

Message:

tidying up, removed dictionary name from getTextString calls

File:

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

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

@@ -83 +83 @@
     {
     System.out.println("Configuring AbstractSearch...");
-    addExtraQueryInfo(info, extra_info);
+    
     this.config_info = info;
 
@@ -92 +92 @@
     this.short_service_info.appendChild(tq_service);
 
-    // add some format info to service map if there is any
-    Element format = (Element) GSXML.getChildByTagName(info, GSXML.FORMAT_ELEM);
+    // add some format info to service map if there is any - look in extra info
+    String path = GSPath.appendLink(GSXML.SEARCH_ELEM, GSXML.FORMAT_ELEM);
+    Element format = (Element) GSXML.getNodeByPath(extra_info, path);
+    
+    //Element format = (Element) GSXML.getChildByTagName(info, GSXML.FORMAT_ELEM);
     if (format != null) {
         this.format_info_map.put(TEXT_QUERY_SERVICE, this.doc.importNode(format, true));
@@ -99 +102 @@
     
     // look for document display format - for documentType
-    String path = GSPath.appendLink(GSXML.DISPLAY_ELEM, GSXML.FORMAT_ELEM);
+    path = GSPath.appendLink(GSXML.DISPLAY_ELEM, GSXML.FORMAT_ELEM);
     Element display_format = (Element)GSXML.getNodeByPath(extra_info, path);
     if (display_format != null) {
@@ -114 +117 @@
     return true;
     }
-
-    protected boolean addExtraQueryInfo(Element info, Element extra_info)
-    {
-    if (extra_info == null) {
-        return false;
-    }
-    Document owner = info.getOwnerDocument();
-    Element config_search = (Element)GSXML.getChildByTagName(extra_info, GSXML.SEARCH_ELEM);
-    // get the format element if any 
-    Element format = (Element)GSXML.getChildByTagName(config_search,
-                              GSXML.FORMAT_ELEM);
-    if (format!=null) { // append to  info
-        info.appendChild(owner.importNode(format, true));
-    }
-
-    return true;
-    }
     
     /** returns the description of the TextQuery service. If a subclass 
@@ -144 +130 @@
     tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
     if (subset==null || subset.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) {
-        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE+".name", lang, "AbstractSearch")));
-        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE+".submit", lang, "AbstractSearch")));
-        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(TEXT_QUERY_SERVICE+".description", lang, "AbstractSearch")));
+        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getServiceName(TEXT_QUERY_SERVICE, lang) ));
+        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getServiceSubmit(TEXT_QUERY_SERVICE, lang) ));
+        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getServiceDescription(TEXT_QUERY_SERVICE, lang)));
     }
     if (subset==null || subset.equals(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER)) {
@@ -157 +143 @@
     
     }
+
+    // perhaps these should be changed to search down the class hierarchy for 
+    // values - do can just put the info in the resource bundle to use it
+    /** returns the default name for the TextQuery service */
+    protected String getServiceName(String service_id, String lang) {
+    return getTextString(service_id+".name", lang);
+    }
     
+    /** returns the default description for the TextQuery service */
+    protected String getServiceDescription(String service_id, String lang) {
+    return getTextString(service_id+".description", lang);
+    }
+
+    /** returns the default submit button text for the TextQuery service */
+    protected String getServiceSubmit(String service_id, String lang) {
+    return getTextString(service_id+".submit", lang);
+
+    }
     /** adds the standard query params into the service description */
     protected void addStandardQueryParams(Element param_list, String lang) 
@@ -188 +191 @@
     Element param = null;
     if (name.equals(QUERY_PARAM)) {
-        param = GSXML.createParameterDescription(this.doc, QUERY_PARAM, getTextString("param."+QUERY_PARAM, lang, "AbstractSearch"), GSXML.PARAM_TYPE_STRING, null, null, null);
+        param = GSXML.createParameterDescription(this.doc, QUERY_PARAM, getTextString("param."+QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
         param_list.appendChild(param);
     } else if (name.equals(INDEX_PARAM)) {
@@ -200 +203 @@
         param_type = GSXML.PARAM_TYPE_ENUM_MULTI;
         }
-        param = GSXML.createParameterDescription2(this.doc, INDEX_PARAM, getTextString("param."+INDEX_PARAM, lang, "AbstractSearch"), param_type, /*this.default_index*/"", index_ids, index_names);
+        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, "AbstractSearch"), GSXML.PARAM_TYPE_INTEGER, "10", null, null);
+            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(CASE_PARAM) || name.equals(STEM_PARAM)) {
         String[] bool_ops = {"0", "1"};
-        String[] bool_texts = {getTextString("param.boolean.off", lang, "AbstractSearch"),getTextString("param.boolean.on", lang, "AbstractSearch")}; 
-        param = GSXML.createParameterDescription(this.doc, name, getTextString("param."+name, lang, "AbstractSearch"), GSXML.PARAM_TYPE_BOOLEAN, BOOLEAN_PARAM_ON, bool_ops, bool_texts);
+        String[] bool_texts = {getTextString("param.boolean.off", lang),getTextString("param.boolean.on", lang)}; 
+        param = GSXML.createParameterDescription(this.doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_BOOLEAN, BOOLEAN_PARAM_ON, bool_ops, bool_texts);
         param_list.appendChild(param);
     } else if (name.equals(MATCH_PARAM)) {
         String[] vals = {MATCH_PARAM_SOME, MATCH_PARAM_ALL };
-        String[] val_texts = {getTextString("param."+MATCH_PARAM+"."+MATCH_PARAM_SOME, lang, "AbstractSearch"), getTextString("param."+MATCH_PARAM+"."+MATCH_PARAM_ALL, lang, "AbstractSearch")}; 
-        param = GSXML.createParameterDescription(this.doc, MATCH_PARAM, getTextString("param."+MATCH_PARAM, lang, "AbstractSearch"), GSXML.PARAM_TYPE_ENUM_SINGLE, MATCH_PARAM_SOME, vals, val_texts);
+        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, "AbstractSearch"), GSXML.PARAM_TYPE_ENUM_SINGLE, "10", hits_options, hits_options);
+        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)) {