Changeset 9874 for trunk/gsdl3/src/java/org/greenstone/gsdl3/core/Receptionist.java

Timestamp:

2005-05-16T11:02:50+12:00 (19 years ago)

Author:

kjdon

Message:

merged from branch ant-install-branch: merge 1

File:

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

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

@@ -50 +50 @@
     }
     
+    public void cleanUp() {}
     public void setParams(GSParams params) {
     this.params = params;
@@ -81 +82 @@
     }
     
-    Element config_doc = this.converter.getDOM(interface_config_file).getDocumentElement();
-    String base_interface = config_doc.getAttribute("baseInterface");
+    Document config_doc = this.converter.getDOM(interface_config_file);
+    if (config_doc == null) {
+        System.err.println("Receptionist: 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_doc);
+    setUpInterfaceOptions(config_elem);
 
     // load up the actions
-    Element action_list = (Element)GSXML.getChildByTagName(config_doc, GSXML.ACTION_ELEM+GSXML.LIST_MODIFIER);
+    Element action_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.ACTION_ELEM+GSXML.LIST_MODIFIER);
     NodeList actions = action_list.getElementsByTagName(GSXML.ACTION_ELEM);
 
@@ -109 +115 @@
     }
 
-    this.language_list = (Element)GSXML.getChildByTagName(config_doc, "languageList");
+    this.language_list = (Element)GSXML.getChildByTagName(config_elem, "languageList");
     if (language_list == null) {
         System.err.println("Receptionist: didn't find a language list in the config file!!");
@@ -229 +235 @@
         base_interfaces.add(base_interface);
         // now see if this has a base interface
-        Element config_doc = this.converter.getDOM(base_interface_config_file).getDocumentElement();
-        base_interface = config_doc.getAttribute("baseInterface");
+        Document config_doc = this.converter.getDOM(base_interface_config_file);
+        if (config_doc == null) {
+        System.err.println("Receptionist: could not parse base interface config file: "+base_interface_config_file.getPath());
+        return false;
+        }
+        Element config_elem = config_doc.getDocumentElement();
+        base_interface = config_elem.getAttribute("baseInterface");
     }
     return true;
     }
 
-    protected boolean setUpInterfaceOptions(Element config_doc) {
-    Element option_list = (Element)GSXML.getChildByTagName(config_doc, "optionList");
+    protected boolean setUpInterfaceOptions(Element config_elem) {
+    Element option_list = (Element)GSXML.getChildByTagName(config_elem, "optionList");
     if (option_list != null) {
         System.err.println("found an option list");