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

Timestamp:

2018-10-30T10:30:53+13:00 (5 years ago)

Author:

kjdon

Message:

receptionist now passes languageList (from interfaceConfig) to teh actions, so an action can add it into the page response if it needs to, rather than the receptionist adding it in to every page. its only ever used in prefs page

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/Receptionist.java (modified) (4 diffs)

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

@@ -133 +133 @@
         setUpInterfaceOptions(config_elem);
 
+        this.language_list = (Element) GSXML.getChildByTagName(config_elem, "languageList");
+        if (this.language_list == null)
+        {
+            logger.error(" didn't find a language list in the config file!!");
+        }
+        
         // load up the actions
         Element action_list = (Element) GSXML.getChildByTagName(config_elem, GSXML.ACTION_ELEM + GSXML.LIST_MODIFIER);
@@ -157 +163 @@
             ac.configure();
             ac.addActionParameters(this.params);
+            ac.setLanguageList(this.language_list);
             this.action_map.put(action_name, ac);
         }
 
-        this.language_list = (Element) GSXML.getChildByTagName(config_elem, "languageList");
-        if (language_list == null)
-        {
-            logger.error(" didn't find a language list in the config file!!");
-        }
 
         return true;
@@ -230 +232 @@
                 ac.configure();
                 ac.addActionParameters(this.params);
+                ac.setLanguageList(this.language_list);
                 this.action_map.put(action, ac);
                 a = ac;
@@ -317 +320 @@
         Element p = (Element)params.item(j);
         if (!p.getAttribute(GSXML.SENSITIVE_ATT).equals("")) {
-          logger.error("removing param "+p.getAttribute("name"));
+          logger.debug("removing param "+p.getAttribute("name"));
           param_list.removeChild(p);
         }