Changeset 9874 for trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.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/MessageRouter.java (modified) (11 diffs)

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

@@ -98 +98 @@
     this.converter = new XMLConverter();
     this.doc = this.converter.newDOM();
-    
-    
-    }
-
+    }
+
+    public void cleanUp() {
+    if (this.module_map != null) {
+        Iterator i = this.module_map.values().iterator();
+        while (i.hasNext()) {
+        ((ModuleInterface)i.next()).cleanUp();
+        }
+    }
+    }
     /** site_home must be set before configure called */
     public void setSiteHome(String home) {
@@ -133 +139 @@
     this.module_map = new HashMap();
 
-    Element config = this.converter.getDOM(configFile).getDocumentElement();
-    
-    Element local_site_name = (Element)GSXML.getChildByTagName(config, GSXML.SITE_NAME_ELEM);
+    Document config_doc = this.converter.getDOM(configFile);
+    if (config_doc == null) {
+System.err.println("MessageRouter: couldn't parse site config file: "+configFile.getPath());
+        return false;
+    }
+    Element config_elem = config_doc.getDocumentElement();
+    
+    Element local_site_name = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_NAME_ELEM);
     if (local_site_name == null) {
         System.err.println("MessageRouter configure error:no site name in config file");
@@ -143 +154 @@
     }
     
-    Element http_address = (Element)GSXML.getChildByTagName(config, GSXML.SITE_HTTP_ADDRESS_ELEM);
+    Element http_address = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_HTTP_ADDRESS_ELEM);
     if (http_address == null) {
         System.err.println("MessageRouter configure error: no http address  in config file");
@@ -151 +162 @@
     }
 
-    Element proxy = (Element)GSXML.getChildByTagName(config, "proxy");
+    Element proxy = (Element)GSXML.getChildByTagName(config_elem, "proxy");
     if (proxy != null) {
         String host = proxy.getAttribute("host");
@@ -180 +191 @@
                      
     // load up the services
-    Element service_rack_list = (Element)GSXML.getChildByTagName(config, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
+    Element service_rack_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
     configureServices(service_rack_list);
     
     // load up the service clusters
-    Element cluster_list = (Element)GSXML.getChildByTagName(config, GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER);    
+    Element cluster_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER);   
     configureClusters(cluster_list);
 
@@ -191 +202 @@
 
     // load up the external sites - this also adds their services/clusters/collections to the other lists - so must be done last
-    Element site_list = (Element)GSXML.getChildByTagName(config, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
+    Element site_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
     configureSites(site_list);
     
@@ -603 +614 @@
                     continue;
                 }
-                site_config_elem  = this.converter.getDOM(configFile).getDocumentElement();
+                Document site_config_doc = this.converter.getDOM(configFile);
+                if (site_config_doc == null) {
+                    System.err.println("MessageRouter: couldn't parse site config file: "+configFile.getPath());
+                    continue;
+                }
+                site_config_elem  = site_config_doc.getDocumentElement();
                 }
                 if (subset.equals(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER)) {
@@ -684 +700 @@
     File init_file = new File(GSFile.collectionInitFile(this.site_home, col_name));
     if (init_file.exists()) {
-        Element init_elem = this.converter.getDOM(init_file).getDocumentElement();
-        String coll_class_name = init_elem.getAttribute("class");
-        if (coll_class_name.equals("")) {
-        c = new Collection();
-        } else {
-        try {
-            c = (Collection)Class.forName("org.greenstone.gsdl3.collection."+coll_class_name).newInstance();
-        } catch (Exception e) {
-            System.out.println("MessageRouter: couldn't create a new collection, type "+coll_class_name+", defaulting to class Collection");
-            c = new Collection();
-        }
-        }
-    } else {
-        // use the defualt collection
+        Document init_doc = this.converter.getDOM(init_file);
+        if (init_doc != null) {
+        Element init_elem = init_doc.getDocumentElement();
+        if (init_elem != null) {
+            String coll_class_name = init_elem.getAttribute("class");
+            if (!coll_class_name.equals("")) {
+            try {
+                c = (Collection)Class.forName("org.greenstone.gsdl3.collection."+coll_class_name).newInstance();
+            } catch (Exception e) {
+                System.out.println("MessageRouter: couldn't create a new collection, type "+coll_class_name+", defaulting to class Collection");
+            }
+            }
+        }
+        }
+    }
+    if (c==null) { // we haven't found anpther classname to use
         c = new Collection();
     }
+    
     c.setCollectionName(col_name);
     c.setSiteHome(this.site_home);
@@ -720 +739 @@
     
     }
-
+    
     protected boolean activateSite(String site_name) {
     System.out.println("MessageRouter:Activating site: "+site_name+".");
@@ -732 +751 @@
         return false;
     }
-    Element config = this.converter.getDOM(configFile).getDocumentElement();
-    
-    Element site_list = (Element)GSXML.getChildByTagName(config, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
+    Document config_doc = this.converter.getDOM(configFile);
+    if (config_doc == null) {
+        System.err.println("MessageRouter: couldn't parse site config file: "+configFile.getPath());
+        return false;
+    }
+    Element config_elem = config_doc.getDocumentElement();
+    
+    Element site_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
     if (site_list ==null ) {
         System.err.println("MessageRouter:activateSite, no sites found");
@@ -789 +813 @@
 
         System.out.println("MessageRouter: deactivating "+name);
-        this.module_map.remove(name);
-
+        ModuleInterface m = (ModuleInterface)this.module_map.remove(name);
+        m.cleanUp(); // clean up any open files/connections etc - can cause trouble on windows
         // also remove the xml bit from description list
         if (type.equals(GSXML.COLLECTION_ELEM)) {