svn commit: r576107 - in /roller/trunk/apps/weblogger: src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java web/WEB-INF/velocity/templates/planet/planetrss.vm

[sn...@apache.org]

Author: snoopdave
Date: Sun Sep 16 06:53:59 2007
New Revision: 576107

URL: http://svn.apache.org/viewvc?rev=576107&view=rev
Log:
Fixing broken feed servlet

Modified:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
    roller/trunk/apps/weblogger/web/WEB-INF/velocity/templates/planet/planetrss.vm

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java?rev=576107&r1=576106&r2=576107&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java Sun Sep 16 06:53:59 2007
@@ -26,11 +26,13 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
 import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.business.PlanetManager;
+import org.apache.roller.planet.config.PlanetRuntimeConfig;
 import org.apache.roller.planet.pojos.Planet;
 import org.apache.roller.weblogger.pojos.StaticTemplate;
 import org.apache.roller.weblogger.pojos.Template;
@@ -119,7 +121,8 @@
 
 
         // looks like we need to render content
-        HashMap model = new HashMap();
+        @SuppressWarnings("unchecked")
+        HashMap<String, Object> model = new HashMap();
         try {
             // populate the rendering model
             if (request.getParameter("group") != null) {
@@ -129,7 +132,13 @@
             model.put("planet", planet);
             model.put("date", new Date());
             model.put("utils", new UtilitiesModel());
-            model.put("absoluteSite", WebloggerRuntimeConfig.getAbsoluteContextURL());
+            model.put("siteName", PlanetRuntimeConfig.getProperty("site.name"));
+            model.put("siteDescription", PlanetRuntimeConfig.getProperty("site.description"));
+            if (StringUtils.isNotEmpty(PlanetRuntimeConfig.getProperty("site.absoluteurl"))) {
+                model.put("absoluteSite", PlanetRuntimeConfig.getProperty("site.absoluteurl"));
+            } else {
+                model.put("absoluteSite", WebloggerRuntimeConfig.getAbsoluteContextURL());
+            }
             model.put("feedStyle", new Boolean(WebloggerRuntimeConfig.getBooleanProperty("site.newsfeeds.styledFeeds")));
 
             int numEntries = WebloggerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");

Modified: roller/trunk/apps/weblogger/web/WEB-INF/velocity/templates/planet/planetrss.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/velocity/templates/planet/planetrss.vm?rev=576107&r1=576106&r2=576107&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/velocity/templates/planet/planetrss.vm (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/velocity/templates/planet/planetrss.vm Sun Sep 16 06:53:59 2007
@@ -22,16 +22,17 @@
   <title>$utils.escapeXML($group.title)</title>
   <description>Aggregated feed for group [$utils.escapeXML($group.title)]</description>
   #else
-  <title>$utils.escapeXML($planet.configuration.title)</title>
-  <description>$utils.escapeXML($planet.configuration.title)</description>
+  <title>$utils.escapeXML($siteName)</title>
+  <description>$utils.escapeXML($siteDescription)</description>
   #end
-  <link>$utils.escapeXML($planet.configuration.siteURL)</link>
+  <link>$utils.escapeXML($absoluteSite)</link>
   <lastBuildDate>$utils.formatRfc822Date($planet.lastUpdated)</lastBuildDate>
   <generator>Roller</generator>
   #if($group)
-     #set($entries = $planet.getAggregation($group, 0, $entryCount))
+     #set($entries = $planet.getEntries($group, 0, $entryCount))
   #else
-     #set($entries = $planet.getAggregation(0, $entryCount))
+     #set($all = $planet.getGroup($planet.getPanet("default"), "all"))
+     #set($entries = $planet.getEntries($all, 0, $entryCount))
   #end
   #foreach( $entry in $entries )
   <item>