Changeset 10290

Timestamp:

2005-07-25T16:03:30+12:00 (19 years ago)

Author:

kjdon

Message:

the address for a remote site can now come from address att as before, or if you specify localSite att, then it assumes its a server run by the local soap server and it can work out the address

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/comms/SOAPCommunicator.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/comms/SOAPCommunicator.java

@@ -77 +77 @@
     }
     remote_site_name_ = site_elem.getAttribute(GSXML.NAME_ATT);
+    if (remote_site_name_.equals("")) {
+        System.err.println("SOAPCommunicator: must have name attribute in site element");
+        return false;
+    }
     remote_site_address_ = site_elem.getAttribute(GSXML.ADDRESS_ATT);
-    if (remote_site_name_==null || remote_site_name_.equals("")) {
-        System.err.println("SOAPCommunicator: must have name attribute in site element");
-        return false;
-    }
-    if (remote_site_address_==null || remote_site_address_.equals("")) {
-        System.err.println("SOAPCommunicator: must have address attribute in site element");
-        return false;
-    }
+    String local_site_name = site_elem.getAttribute(GSXML.LOCAL_SITE_ATT);
+    if (remote_site_address_.equals("") && local_site_name.equals("")) {
+        System.err.println("SOAPCommunicator: must have address or localSite attributes in site element");
+        return false;
+    }
+    if (remote_site_address_.equals("")) {
+        remote_site_address_ = GlobalProperties.getGSDL3WebAddress()+"/services/"+local_site_name;
+    }
+
     try {
         Service service = new Service();