[Aplaws-commit] r1219 - trunk/ccm-ldn-rss/src/com/arsdigita/london/rss

[<ap...@vh...>]

Author: apevec
Date: 2006-06-15 00:57:25 +0200 (Thu, 15 Jun 2006)
New Revision: 1219

Modified:
   trunk/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java
Log:
patch from francois.mounier


Modified: trunk/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java
===================================================================
--- trunk/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java	2006-06-14 22:26:57 UTC (rev 1218)
+++ trunk/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java	2006-06-14 22:57:25 UTC (rev 1219)
@@ -35,7 +35,6 @@
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.cms.ContentItem;
-import com.arsdigita.cms.ContentItem;
 import com.arsdigita.kernel.URLService;
 import com.arsdigita.web.URL;
 import com.arsdigita.web.ParameterMap;
@@ -66,8 +65,6 @@
     private static org.apache.log4j.Logger s_log =
         org.apache.log4j.Logger.getLogger(RSSService.class);
 
-    private static final String serverURL = URL.root().getServerURI();
-   
     /**
      * Generates an RSS channel for a specified category and and all of its Articles.
      */
@@ -141,7 +138,7 @@
         }
 
         Element channelLink = new Element("link", rssNS);
-        channelLink.setText(serverURL.concat(URLService.locate(cat.getOID())));
+        channelLink.setText((URL.there(request,null).getServerURI()).concat(URLService.locate(cat.getOID())));
         channel.addContent(channelLink);
 
         Element channelDescription = new Element("description", rssNS);
@@ -196,7 +193,7 @@
                 title = item.getDisplayName();
             }
 
-            String itemURL = serverURL.concat(URLService.locate(item.getOID()));
+            String itemURL = (URL.there(request,null).getServerURI()).concat(URLService.locate(item.getOID()));
 
             s_log.debug("item is live");