Changeset 29979 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/RSSRetrieve.java

Timestamp:

2015-06-12T09:39:20+12:00 (9 years ago)

Author:

Georgiy Litvinov

Message:

RSS Feed Links url use baseUrl from request. Fixed broken links when we use AJP proxy.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/RSSRetrieve.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/RSSRetrieve.java

@@ -26 +26 @@
 import java.util.Date;
 import java.text.SimpleDateFormat;
+
 import org.apache.log4j.*;
 
@@ -90 +91 @@
     //logger.error("**** collection metadata:");
     //GSXML.elementToLogAsString(collMeta, true);
-
+    
     // work out some commonly used variables such as lang and url_prefix
     String lang = request.getAttribute("lang");
@@ -96 +97 @@
         lang = "en";
     }
-
+    //Get baseUrl from request 
+    String baseURL = request.getAttribute("baseURL");
+    
     // url_prefix is of the form http://domain/greenstone3/library/collection/_colname_/
-    String url_prefix = GlobalProperties.getFullGSDL3WebAddress()+"/"+this.library_name+"/collection/"+this.cluster_name;
-
+    //String url_prefix = GlobalProperties.getFullGSDL3WebAddress()+"/"+this.library_name+"/collection/"+this.cluster_name;
+    String url_prefix = baseURL+"library"+"/"+this.library_name+"/collection/"+this.cluster_name;
 
     // generate the header and footer