svn commit: r596741 - in /roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache: SiteWideCache.java WeblogFeedCache.java

[snoopdave]

Author: snoopdave
Date: Tue Nov 20 09:04:51 2007
New Revision: 596741

URL: http://svn.apache.org/viewvc?rev=596741&view=rev
Log:
Adding search terms as part of cache key

Modified:
    
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
    
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java

Modified: 
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
URL: 
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java?rev=596741&r1=596740&r2=596741&view=diff
==============================================================================
--- 
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
 (original)
+++ 
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
 Tue Nov 20 09:04:51 2007
@@ -288,6 +288,10 @@
         key.append("/").append(feedRequest.getType());
         key.append("/").append(feedRequest.getFormat());
         
+        if (feedRequest.getTerm() != null) {
+            key.append("/search/").append(feedRequest.getTerm());
+        }
+        
         if(feedRequest.getWeblogCategoryName() != null) {
             String cat = feedRequest.getWeblogCategoryName();
             try {

Modified: 
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java
URL: 
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java?rev=596741&r1=596740&r2=596741&view=diff
==============================================================================
--- 
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java
 (original)
+++ 
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java
 Tue Nov 20 09:04:51 2007
@@ -165,7 +165,10 @@
         
         key.append("/").append(feedRequest.getType());
         key.append("/").append(feedRequest.getFormat());
-        key.append("/").append(feedRequest.getTerm());
+        
+        if (feedRequest.getTerm() != null) {
+            key.append("/search/").append(feedRequest.getTerm());
+        }
         
         if(feedRequest.getWeblogCategoryName() != null) {
             String cat = feedRequest.getWeblogCategoryName();