Changeset 4903 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GATEServices.java

Timestamp:

2003-07-11T16:29:16+12:00 (21 years ago)

Author:

kjdon

Message:

tidied up a lot of stuff, particularly the display text stuff, including how its formatted, and some of the service rack methods

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GATEServices.java (modified) (3 diffs)

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

@@ -84 +84 @@
 
     // set up short_service_info_ - for now just has name and type
-    Element tq_service = doc_.createElement(GSXML.SERVICE_ELEM);
-    tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_ENRICH);
-    tq_service.setAttribute(GSXML.NAME_ATT, GATE_POS_TAG_SERVICE);
-    short_service_info_.appendChild(tq_service);
-
-    // set up service_info_map_ - for now, just has the same elements as above
-    // should have full details about each service incl params lists etc.
-    Element tq_service_full = (Element) tq_service.cloneNode(true);
-    Element param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    createParameter(ANNOTATION_TYPE_PARAM, param_list, false, null);
-    tq_service_full.appendChild(param_list);
-    service_info_map_.put(GATE_POS_TAG_SERVICE, tq_service_full);
-
-    // add some format info to service map if there is any
-    // Element format = (Element) GSXML.getChildByTagName(info, GSXML.FORMAT_ELEM);
-    // if (format != null) {
-    //     format_info_map_.put(GATE_POS_TAG_SERVICE, doc_.importNode(format, true));
-    // }
+    Element tag_service = doc_.createElement(GSXML.SERVICE_ELEM);
+    tag_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_ENRICH);
+    tag_service.setAttribute(GSXML.NAME_ATT, GATE_POS_TAG_SERVICE);
+    short_service_info_.appendChild(tag_service);
+
 
     // Configure GATE for use
@@ -141 +128 @@
     }
 
-
-    /** creates a display element containing all the text strings needed to display
-    the service page, in the language specified */
-    protected Element createServiceDisplay(String service, String lang)
-    {
-    // Create a service display for the basic text query service
-    Element display = doc_.createElement(GSXML.DISPLAY_ELEM);
-    display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_NAME_ELEM, getTextString(service+".name", lang)));
-    display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_SUBMIT_ELEM, getTextString(service+".submit", lang)));
-
-    // now need to add in the params
-    if (service.equals(GATE_POS_TAG_SERVICE)) {
-        createParameter(ANNOTATION_TYPE_PARAM, display, true, lang);
-    }
-
-    return display;
+    protected Element getServiceDescription(String service, String lang) {
+
+    if (!service.equals(GATE_POS_TAG_SERVICE)) {
+        return null;
+    }
+    Element tag_service = doc_.createElement(GSXML.SERVICE_ELEM);
+    tag_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_ENRICH);
+    tag_service.setAttribute(GSXML.NAME_ATT, GATE_POS_TAG_SERVICE);
+    tag_service.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_NAME, getTextString(service+".name", lang)));
+    tag_service.appendChild(GSXML.createDisplayTextElement(doc_, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service+".submit", lang)));
+    Element param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    createParameter(ANNOTATION_TYPE_PARAM, param_list, lang);
+    tag_service.appendChild(param_list);
+
+    return tag_service;
     }
 
@@ -162 +148 @@
     /** creates a new param element and adds it to the param list */
     protected void createParameter(String name, Element param_list, 
-                   boolean display, String lang)
+                   String lang)
     {
     Element param = null;
 
     if (name.equals(ANNOTATION_TYPE_PARAM)) {
-        if (display) {
-        int len = annotation_types_.length;
-        String[] annotation_type_names = new String[len];
-        for (int i = 0; i < len; i++) {
-            annotation_type_names[i] = getTextString("param." + name + "." + annotation_types_[i], lang);
-        }
-        
-        param = GSXML.createParameterDisplay(doc_, name, getTextString("param." + name, lang), annotation_types_, annotation_type_names);
+        int len = annotation_types_.length;
+        String[] annotation_type_names = new String[len];
+        for (int i = 0; i < len; i++) {
+        annotation_type_names[i] = getTextString("param." + name + "." + annotation_types_[i], lang);
         }
-        else {
-        param = GSXML.createParameterDescription(doc_, name, GSXML.PARAM_TYPE_ENUM_MULTI, annotation_types_[0], annotation_types_);
-        }
+        
+        param = GSXML.createParameterDescription(doc_, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, annotation_types_[0], annotation_types_, annotation_type_names);
+        param_list.appendChild(param);
     }
     
-    // Add the parameter to the list
-    if (param != null) {
-        param_list.appendChild(param);
-    }   
-    }
-
-
+    }
+    
+    
     protected Element processGatePOSTag(Element request)
     {