svn commit: r620509 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering: servlets/PlanetFeedServlet.java util/PlanetRequest.java util/cache/PlanetCache.java

[snoopdave]

Author: snoopdave
Date: Mon Feb 11 08:09:13 2008
New Revision: 620509

URL: http://svn.apache.org/viewvc?rev=620509&view=rev
Log:
Merging fix for ROL-1644 to trunk

Modified:
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/PlanetRequest.java
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java

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=620509&r1=620508&r2=620509&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
 Mon Feb 11 08:09:13 2008
@@ -261,6 +261,11 @@
             }
         }
 
+        // add group
+        if (planetRequest.getGroup() != null) {
+            key.append("/group=").append(planetRequest.getGroup());
+        }
+
         return key.toString();
     }
 }

Modified: 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/PlanetRequest.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/PlanetRequest.java?rev=620509&r1=620508&r2=620509&view=diff
==============================================================================
--- 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/PlanetRequest.java
 (original)
+++ 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/PlanetRequest.java
 Mon Feb 11 08:09:13 2008
@@ -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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java?rev=620509&r1=620508&r2=620509&view=diff
==============================================================================
--- 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
 (original)
+++ 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
 Mon Feb 11 08:09:13 2008
@@ -219,6 +219,11 @@
             }
         }
         
+        // add group
+        if (planetRequest.getGroup() != null) {
+            key.append("/group=").append(planetRequest.getGroup());
+        }
+
         return key.toString();
     }