Changeset 29979
- Timestamp:
- 2015-06-12T09:39:20+12:00 (9 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone/gsdl3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/RSSAction.java
r28964 r29979 10 10 // other java stuff 11 11 import java.util.*; 12 13 12 import java.io.Serializable; 14 15 13 import java.io.PrintWriter; 16 14 import java.io.Serializable; … … 27 25 public Node process(Node message_node) 28 26 { 27 29 28 Element message = GSXML.nodeToElement(message_node); 30 29 Document doc = message.getOwnerDocument(); … … 41 40 String collection = (String) params.get(GSParams.COLLECTION); 42 41 String to = GSPath.prependLink(service_name, collection); // collection/RSSFeed 42 // Get baseUrl for links in RSS Feed 43 String baseUrl = request.getAttribute("baseURL"); 44 43 45 44 46 // the first part of the response is the service description … … 48 50 Element mr_request_message = doc.createElement(GSXML.MESSAGE_ELEM); 49 51 Element rss_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext); 52 //Pass baseURL to processRSSFeed 53 rss_request.setAttribute("baseURL", baseUrl); 50 54 mr_request_message.appendChild(rss_request); 51 55 52 56 Element rss_response = (Element) this.mr.process(mr_request_message); 53 57 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
r28966 r29979 26 26 import java.util.Date; 27 27 import java.text.SimpleDateFormat; 28 28 29 import org.apache.log4j.*; 29 30 … … 90 91 //logger.error("**** collection metadata:"); 91 92 //GSXML.elementToLogAsString(collMeta, true); 92 93 93 94 // work out some commonly used variables such as lang and url_prefix 94 95 String lang = request.getAttribute("lang"); … … 96 97 lang = "en"; 97 98 } 98 99 //Get baseUrl from request 100 String baseURL = request.getAttribute("baseURL"); 101 99 102 // url_prefix is of the form http://domain/greenstone3/library/collection/_colname_/ 100 String url_prefix = GlobalProperties.getFullGSDL3WebAddress()+"/"+this.library_name+"/collection/"+this.cluster_name;101 103 //String url_prefix = GlobalProperties.getFullGSDL3WebAddress()+"/"+this.library_name+"/collection/"+this.cluster_name; 104 String url_prefix = baseURL+"library"+"/"+this.library_name+"/collection/"+this.cluster_name; 102 105 103 106 // generate the header and footer
Note:
See TracChangeset
for help on using the changeset viewer.