Changeset 26195 for main

Timestamp:

2012-09-13T14:09:03+12:00 (12 years ago)

Author:

kjdon

Message:

if the greenstone context (/greenstone3 normally) is empty, and therefore gsdl3webaddress is empty, then start site_http_address with sites, not /sites

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java (modified) (1 diff)

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

@@ -168 +168 @@
         }
         this.site_home = GSFile.siteHome(GlobalProperties.getGSDL3Home(), this.site_name);
-        this.site_http_address = GlobalProperties.getGSDL3WebAddress() + "/sites/" + this.site_name;
-
+        String web_address = GlobalProperties.getGSDL3WebAddress();
+        if (web_address.equals("")) {
+            this.site_http_address = "sites/"+this.site_name;
+        } else { 
+            this.site_http_address = web_address + "/sites/" + this.site_name;
+        }
         // are we behind a firewall?? - is there a better place to set up the proxy?
         String host = GlobalProperties.getProperty("proxy.host");