Changeset 29979

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.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• action/RSSAction.java (modified) (4 diffs)
• service/RSSRetrieve.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/RSSAction.java

@@ -10 +10 @@
 // other java stuff
 import java.util.*;
-
 import java.io.Serializable;
-
 import java.io.PrintWriter;
 import java.io.Serializable;
@@ -27 +25 @@
     public Node process(Node message_node)
     {
+        
         Element message = GSXML.nodeToElement(message_node);
         Document doc = message.getOwnerDocument();
@@ -41 +40 @@
         String collection = (String) params.get(GSParams.COLLECTION);
         String to = GSPath.prependLink(service_name, collection); // collection/RSSFeed
+        // Get baseUrl for links in RSS Feed
+        String baseUrl = request.getAttribute("baseURL");
+        
         
         // the first part of the response is the service description 
@@ -48 +50 @@
         Element mr_request_message = doc.createElement(GSXML.MESSAGE_ELEM);
         Element rss_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
+        //Pass baseURL to processRSSFeed
+        rss_request.setAttribute("baseURL", baseUrl);
         mr_request_message.appendChild(rss_request);
-
+        
         Element rss_response = (Element) this.mr.process(mr_request_message);
         rss_response = (Element) GSXML.getChildByTagName(rss_response, GSXML.RESPONSE_ELEM); // just the response tag

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