Changeset 33078

Timestamp:

2019-05-14T19:43:09+12:00 (5 years ago)

Author:

kjdon

Message:

adding in processing <format><paramDefault> in siteConfig and interfaceConfig.

Location:

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

Files:

• MessageRouter.java (modified) (2 diffs)
• Receptionist.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -504 +504 @@
         Element display_item_list_elem = (Element) GSXML.getChildByTagName(config_info, GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
         DisplayItemUtil.storeDisplayItems(this.display_item_list, display_item_list_elem);
+        Element format_elem = (Element) GSXML.getChildByTagName(config_info, GSXML.FORMAT_ELEM);
+        configureFormat(format_elem);
         return true;
 
@@ -643 +645 @@
         return true;
     }
+
+    // for now, only handle paramDefault elems
+    protected boolean configureFormat(Element format_elem) {
+    NodeList param_defaults = format_elem.getElementsByTagName(GSXML.PARAM_DEFAULT_ELEM);
+    for (int i=0; i<param_defaults.getLength(); i++) {
+        
+        Element p = (Element)param_defaults.item(i);
+        String name = p.getAttribute(GSXML.NAME_ATT);
+        String value = p.getAttribute(GSXML.VALUE_ATT);
+        this.params.setParamDefault(name, value);
+    }
+    return true;
+    }
 
     /**

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

@@ -103 +103 @@
     {
 
+            logger.info("configuring the Receptionist");
         if (this.config_params == null)
         {
@@ -139 +140 @@
         }
         
+        // configure any format info
+        Element format_elem = (Element) GSXML.getChildByTagName(config_elem, GSXML.FORMAT_ELEM);
+        configureFormat(format_elem);
+
         // load up the actions
         Element action_list = (Element) GSXML.getChildByTagName(config_elem, GSXML.ACTION_ELEM + GSXML.LIST_MODIFIER);
@@ -398 +403 @@
     }
 
+    // for now, only handle paramDefault elems
+    protected boolean configureFormat(Element format_elem) {
+    NodeList param_defaults = format_elem.getElementsByTagName(GSXML.PARAM_DEFAULT_ELEM);
+    for (int i=0; i<param_defaults.getLength(); i++) {
+        Element p = (Element)param_defaults.item(i);
+        String name = p.getAttribute(GSXML.NAME_ATT);
+        String value = p.getAttribute(GSXML.VALUE_ATT);
+        this.params.setParamDefault(name, value);
+    }
+    return true;
+    }
+
     protected void preProcessRequest(Element request)
     {