Changeset 38372 for main/trunk/greenstone3

Timestamp:

2023-11-15T11:37:24+13:00 (7 months ago)

Author:

kjdon

Message:

we want urls to start at library, not greenstone3 - we are using a baseHref. And we may be mapping to a different context. But, will this muck up somewhere else??

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

@@ -171 +171 @@
         this.class_loader = new CustomClassLoader(this.getClass().getClassLoader(), GSFile.siteResourceDir(this.site_home));
 
+        // we want urls to start at library, not greenstone3 - we are using a baseHref.
+        // And we may be mapping to a different context
+        // But, will this muck up somewhere else??
+        this.site_http_address = this.library_name+"/sites/"+this.site_name;
+        /*
         String web_address = GlobalProperties.getGSDL3WebAddress();
-        if (web_address.equals("")) { // *****
+        if (web_address.equals("")) { 
             this.site_http_address = this.library_name+"/sites/"+this.site_name;
         } else { 
             this.site_http_address = web_address + "/"+this.library_name+"/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");