Changeset 33180 for main

Timestamp:

2019-06-21T14:28:43+12:00 (5 years ago)

Author:

kjdon

Message:

adding library_name in front of sites for colleciton assoc file links - we can't get library name otherwise in URLFilter as this Filter operates outside of the servlets. So lets pass in via our URLs. used for security checking collection documents

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

@@ -172 +172 @@
 
         String web_address = GlobalProperties.getGSDL3WebAddress();
-        if (web_address.equals("")) {
-            this.site_http_address = "sites/"+this.site_name;
+        if (web_address.equals("")) { // *****
+            this.site_http_address = this.library_name+"/sites/"+this.site_name;
         } else { 
-            this.site_http_address = web_address + "/sites/" + this.site_name;
-        }
+            this.site_http_address = web_address + "/"+this.library_name+"/sites/" + this.site_name;
+        }
+        logger.error("KATH - site http address = "+this.site_http_address);
         // are we behind a firewall?? - is there a better place to set up the proxy?
         String host = GlobalProperties.getProperty("proxy.host");