Author: snoopdave
Date: Sun Sep 16 08:15:36 2007
New Revision: 576116
URL: http://svn.apache.org/viewvc?rev=576116&view=rev
Log:
Planet feed servlet was completely broken
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=576116&r1=576115&r2=576116&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 08:15:36 2007
@@ -134,6 +134,7 @@
model.put("utils", new UtilitiesModel());
model.put("siteName",
PlanetRuntimeConfig.getProperty("site.name"));
model.put("siteDescription",
PlanetRuntimeConfig.getProperty("site.description"));
+ model.put("lastModified", lastModified);
if
(StringUtils.isNotEmpty(PlanetRuntimeConfig.getProperty("site.absoluteurl"))) {
model.put("absoluteSite",
PlanetRuntimeConfig.getProperty("site.absoluteurl"));
} else {
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=576116&r1=576115&r2=576116&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 08:15:36 2007
@@ -26,7 +26,7 @@
<description>$utils.escapeXML($siteDescription)</description>
#end
<link>$utils.escapeXML($absoluteSite)</link>
- <lastBuildDate>$utils.formatRfc822Date($planet.lastUpdated)</lastBuildDate>
+ <lastBuildDate>$utils.formatRfc822Date($lastModified)</lastBuildDate>
<generator>Roller</generator>
#if($group)
#set($entries = $planet.getEntries($group, 0, $entryCount))
@@ -47,7 +47,14 @@
<category>$utils.escapeXML($cat.name)</category>
#end
#end
- #if($entry.permalink)<link>$utils.escapeXML($entry.permalink)</link> #end
+ #if($entry.permalink)
+ <link>$utils.escapeXML($entry.permalink)</link>
+ #end
+ #if($entry.guid)
+ <guid>$utils.escapeXML($entry.guid)</guid>
+ #elseif ($entry.permalink)
+ <guid isPermaLink="true">$utils.escapeXML($entry.permalink)</guid>
+ #end
<pubDate>$utils.formatRfc822Date($entry.pubTime)</pubDate>
#if(!$utils.isEmpty($entry.author))
<dc:creator>$utils.escapeXML($entry.author)</dc:creator>
