You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/12/29 19:38:43 UTC
svn commit: r607460 - in
/roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering:
servlets/PlanetFeedServlet.java util/PlanetRequest.java
util/cache/PlanetCache.java
Author: snoopdave
Date: Sat Dec 29 10:38:42 2007
New Revision: 607460
URL: http://svn.apache.org/viewvc?rev=607460&view=rev
Log:
Fix for "Planet group feeds do not work"
http://opensource.atlassian.com/projects/roller/browse/ROL-1644
Added request parameter 'group' to cache key
Modified:
roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/PlanetRequest.java
roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
Modified: roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java?rev=607460&r1=607459&r2=607460&view=diff
==============================================================================
--- roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java (original)
+++ roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java Sat Dec 29 10:38:42 2007
@@ -261,6 +261,11 @@
}
}
+ // add group
+ if (planetRequest.getGroup() != null) {
+ key.append("/group=").append(planetRequest.getGroup());
+ }
+
return key.toString();
}
}
Modified: roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/PlanetRequest.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/PlanetRequest.java?rev=607460&r1=607459&r2=607460&view=diff
==============================================================================
--- roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/PlanetRequest.java (original)
+++ roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/PlanetRequest.java Sat Dec 29 10:38:42 2007
@@ -37,6 +37,7 @@
private String flavor = null;
private boolean excerpts = false;
private String language = null;
+ private String group = null;
/**
@@ -78,12 +79,16 @@
*
* the only params we currently care about are:
* excerpts - specifies the feed should only include excerpts
- *
+ * group - specifies the aggregation group to include
*/
- if(request.getParameter("excerpts") != null) {
+ if (request.getParameter("excerpts") != null) {
this.excerpts = Boolean.valueOf(request.getParameter("excerpts")).booleanValue();
}
+ if (request.getParameter("group") != null) {
+ this.group = request.getParameter("group");
+ }
+
// language is always from the browser
language = request.getLocale().getLanguage();
@@ -114,4 +119,7 @@
this.language = language;
}
+ public String getGroup() {
+ return group;
+ }
}
Modified: roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java?rev=607460&r1=607459&r2=607460&view=diff
==============================================================================
--- roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java (original)
+++ roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java Sat Dec 29 10:38:42 2007
@@ -219,6 +219,11 @@
}
}
+ // add group
+ if (planetRequest.getGroup() != null) {
+ key.append("/group=").append(planetRequest.getGroup());
+ }
+
return key.toString();
}