Changeset 8921

Timestamp:

2005-01-20T16:43:16+13:00 (19 years ago)

Author:

kjdon

Message:

fixed up the receptionist option handling stuff

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/core

Files:

• Receptionist.java (modified) (2 diffs)
• TransformingReceptionist.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/Receptionist.java

@@ -84 +84 @@
     String base_interface = config_doc.getAttribute("baseInterface");
     setUpBaseInterface(base_interface);
-
-    // get any interface options
-    Element option_list = (Element)GSXML.getChildByTagName(config_doc, "optionList");
-    if (option_list != null) {
-        // we set any options in the config params
-        NodeList options = option_list.getElementsByTagName("option");
-        for (int i=0; i<options.getLength(); i++) {
-        Element option = (Element)options.item(i);
-        String name = option.getAttribute(GSXML.NAME_ATT);
-        String value = option.getAttribute(GSXML.VALUE_ATT);
-        if (!name.equals("") && !value.equals("")) {
-            this.config_params.put(name, value);
-        }
-        }
-    }
+    setUpInterfaceOptions(config_doc);
 
     // load up the actions
@@ -248 +234 @@
     return true;
     }
+
+    protected boolean setUpInterfaceOptions(Element config_doc) {
+    Element option_list = (Element)GSXML.getChildByTagName(config_doc, "optionList");
+    if (option_list != null) {
+        System.err.println("found an option list");
+        // we set any options in the config params
+        NodeList options = option_list.getElementsByTagName("option");
+        for (int i=0; i<options.getLength(); i++) {
+        Element option = (Element)options.item(i);
+        String name = option.getAttribute(GSXML.NAME_ATT);
+        String value = option.getAttribute(GSXML.VALUE_ATT);
+        System.err.println("option: "+name+", "+value);
+        if (!name.equals("") && !value.equals("")) {
+            this.config_params.put(name, value);
+        }
+        }
+    }
+
+    return true;
+    }
+
     protected void preProcessRequest(Element request) {
     return;

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -56 +56 @@
     String base_interface = config_doc.getAttribute("baseInterface");
     setUpBaseInterface(base_interface);
+    setUpInterfaceOptions(config_doc);
+
     Element action_list = (Element)GSXML.getChildByTagName(config_doc, GSXML.ACTION_ELEM+GSXML.LIST_MODIFIER);
     NodeList actions = action_list.getElementsByTagName(GSXML.ACTION_ELEM);