Changeset 33180 for main

Show
Ignore:
Timestamp:
21.06.2019 14:28:43 (3 months 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

    r33080 r33180  
    172172 
    173173        String web_address = GlobalProperties.getGSDL3WebAddress(); 
    174         if (web_address.equals("")) { 
    175             this.site_http_address = "sites/"+this.site_name; 
     174        if (web_address.equals("")) { // ***** 
     175            this.site_http_address = this.library_name+"/sites/"+this.site_name; 
    176176        } else {  
    177             this.site_http_address = web_address + "/sites/" + this.site_name; 
    178         } 
     177            this.site_http_address = web_address + "/"+this.library_name+"/sites/" + this.site_name; 
     178        } 
     179        logger.error("KATH - site http address = "+this.site_http_address); 
    179180        // are we behind a firewall?? - is there a better place to set up the proxy? 
    180181        String host = GlobalProperties.getProperty("proxy.host");