Changeset 4000

Timestamp:

2003-03-26T12:15:39+12:00 (21 years ago)

Author:

kjdon

Message:

now sets site address for colls and services - address obtained from site config file

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java (modified) (7 diffs)

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

@@ -61 +61 @@
     /** site home - the home directory for the site */
     protected String site_home_=null;
+    /** the http address for this site */
+    protected String site_http_address_=null;
+    
     /** the global name for this site */
     protected String global_site_name_=null;
@@ -188 +191 @@
     public Element process(Element message) {
 
+    //System.out.println("MR received request");
+    //System.out.println(converter_.getString(message));
+               
     // check that its a correct message tag
     if (!message.getTagName().equals(GSXML.MESSAGE_ELEM)) {
@@ -238 +244 @@
     } // for each request
     
+    //System.out.println("MR returned response");
+    //System.out.println(converter_.getString(mainResult));
+
     return mainResult;
     
@@ -263 +272 @@
     } else {
         global_site_name_ = local_site_name.getAttribute(GSXML.VALUE_ATT);
+    }
+    
+    Element http_address = (Element)GSXML.getChildByTagName(config, 
+                        GSXML.SITE_HTTP_ADDRESS_ELEM);
+    if (http_address == null) {
+        System.err.println("MessageRouter configure error: no http address  in config file");
+        return false;
+    } else {
+        site_http_address_ = http_address.getAttribute(GSXML.VALUE_ATT);
     }
     
@@ -284 +302 @@
             ServiceCluster sc = new ServiceCluster();
             sc.setSiteHome(site_home_);
+            sc.setSiteAddress(site_http_address_);
             sc.setClusterName(name);
             sc.setMessageRouter(this);
@@ -324 +343 @@
                 ServiceRack s = (ServiceRack)Class.forName("org.greenstone.gsdl3.service."+service_name).newInstance();
                 s.setSiteHome(site_home_);
+                s.setSiteAddress(site_http_address_);
                 s.setMessageRouter(this);
                 
@@ -478 +498 @@
     c.setCollectionName(col_name);
     c.setSiteHome(site_home_);
+    c.setSiteAddress(site_http_address_);
     if (c.configure()) {
         // this could be a reactivation, so delete the old version