Changeset 33079 for main/trunk

Timestamp:

2019-05-14T19:47:08+12:00 (5 years ago)

Author:

kjdon

Message:

make TransformingReceptionist call Receptionist.configure rather than having the entire method copied in this class.

File:

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

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

@@ -101 +101 @@
     }
 
-    /** configures the receptionist - overwrite this to set up the xslt map */
+    /** configures the receptionist - adding in setting up the xslt map */
     public boolean configure()
     {
-        if (this.config_params == null)
-        {
-            logger.error(" config variables must be set before calling configure");
-            return false;
-        }
-        if (this.mr == null)
-        {
-            logger.error(" message router must be set  before calling configure");
-            return false;
-        }
+        if (!super.configure()) {
+        
+        return false;
+        }
+        
+        logger.info("configuring the TransformingReceptionist");
 
         // find the config file containing a list of actions
         File interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.INTERFACE_NAME))));
-        if (!interface_config_file.exists())
-        {
-            logger.error(" interface config file: " + interface_config_file.getPath() + " not found!");
-            return false;
-        }
         Document config_doc = this.converter.getDOM(interface_config_file, "utf-8");
-        if (config_doc == null)
-        {
-            logger.error(" could not parse interface config file: " + interface_config_file.getPath());
-            return false;
-        }
         Element config_elem = config_doc.getDocumentElement();
-        String base_interface = config_elem.getAttribute("baseInterface");
-        setUpBaseInterface(base_interface);
-        setUpInterfaceOptions(config_elem);
-
-        Element lang_list = (Element) GSXML.getChildByTagName(config_elem, "languageList");
-        if (lang_list == null)
-        {
-            logger.error(" didn't find a language list in the config file!!");
-        }
-        else
-        {
-          this.language_list = lang_list;
-        }
         
+        // Find the actions again so that we can set up the xslt map
         Element action_list = (Element) GSXML.getChildByTagName(config_elem, GSXML.ACTION_ELEM + GSXML.LIST_MODIFIER);
         NodeList actions = action_list.getElementsByTagName(GSXML.ACTION_ELEM);
@@ -151 +125 @@
             String class_name = action.getAttribute("class");
             String action_name = action.getAttribute("name");
-            Action ac = null;
-            try
-            {
-                ac = (Action) Class.forName("org.greenstone.gsdl3.action." + class_name).newInstance();
-            }
-            catch (Exception e)
-            {
-                logger.error(" couldn't load in action " + class_name);
-                e.printStackTrace();
-                continue;
-            }
-            ac.setConfigParams(this.config_params);
-            ac.setMessageRouter(this.mr);
-            ac.configure();
-            ac.addActionParameters(this.params);
-            ac.setLanguageList(this.language_list);
-            this.action_map.put(action_name, ac);
 
             // now do the xslt map