Changeset 4903 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.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/ServiceRack.java (modified) (9 diffs)

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

@@ -79 +79 @@
     protected Document doc_ = null;
 
-    /** XML element for describe requests - list of supported services */
+    /** XML element for describe requests - list of supported services
+    - this is static     */
     protected Element short_service_info_ = null;
 
-    /** XML element for describe requests - map of service name to full 
-    description */
-    protected HashMap service_info_map_ = null;
     /** XML element for stylesheet requests - map of service name to format 
     elem */
@@ -117 +115 @@
     doc_ = converter_.newDOM();
     short_service_info_ = doc_.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
-    service_info_map_ = new HashMap();
     format_info_map_ = new HashMap();
     }
@@ -191 +188 @@
         String to = GSPath.getFirstLink(request.getAttribute(GSXML.TO_ATT));        
         Element response = null;
-        if (service_info_map_.containsKey(to)) { 
-            try {
+        try {
             Class c = this.getClass();
             Class []params = {Class.forName("org.w3c.dom.Element")};
-
+            
             String method_name = "process"+to;
             Method m = null;
@@ -226 +222 @@
             mainResult.appendChild(doc_.importNode(response, true));
             }
-                       
-            } catch (ClassNotFoundException e) {
-            System.err.println("ServiceRack error: Element class not found");
-            return null;
-            }
-        } else {
-            // else error in to field
-            System.err.println("ServiceRack describe request: error in 'to' field, non-existant service "+to+" specified!");
+            
+        } catch (ClassNotFoundException e) {
+            System.err.println("ServiceRack error: Element class not found");
             return null;
         }
@@ -242 +233 @@
         
     }
+
+ 
 
     /** process method for describe requests 
@@ -258 +251 @@
     
     // describe a particular service    
-    if (service_info_map_.containsKey(to)) {
-        response.appendChild(getServiceDescription(to, lang));
+    //if (service_info_map_.containsKey(to)) {
+    Element description = getServiceDescription(to, lang);
+    if (description != null) { // may be null if non-existant service
+        response.appendChild(description);
         response.setAttribute(GSXML.FROM_ATT, to);
-        return response;
     }
-    // else error in to field
-    System.err.println("ServiceRack describe request: error in 'to' field, to='"+to+"'.");
-    return null;
+    return response;
     
     }
@@ -288 +280 @@
         return response;
     }
-    // else error in to field
+    // else no format info
     System.err.println("ServiceRack describe request: no format info for "+to+".");
     return response;
     }   
     
-    // the following two should be overwritten for info with any language stuff in it
     /** returns the service list for the subclass */
     protected Element getServiceList(String lang) {
-    // for now, it is static and there is no lang stuff
-    return short_service_info_;
+    // for now, it is static and has no language stuff
+    return (Element) short_service_info_.cloneNode(true);
     }
     
     /** returns a specific service description */
-    protected Element getServiceDescription(String service, String lang) {
-    Element descript = (Element)((Element)service_info_map_.get(service)).cloneNode(true);
-    // for now, create the display element on the fly - look at caching it later
-    Element display = createServiceDisplay(service, lang);
-    addServiceDisplay(descript, display);
-    return descript;
-    }
-    
-    
-    /** adds the display element into the description - appends to the root for now, but may do something fancy later */
-    protected boolean addServiceDisplay(Element descript, Element display) {
-    if (descript.getOwnerDocument() != display.getOwnerDocument()) {
-        display = (Element)descript.getOwnerDocument().importNode(display, true);
-    }
-    descript.appendChild(display);
-    return true;
-    }
+    abstract protected Element getServiceDescription(String service, String lang);
 
     protected Element getServiceFormat(String service) {
@@ -323 +298 @@
     return format;
     }
-    /** creates a display element containing all the text strings needed to display the service page, in the language specified */
-    abstract protected Element createServiceDisplay(String service, String lang);
 
     /** overloaded version for no args case */
@@ -345 +318 @@
     return result;
     }
+
+    
 }
+