roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r427771 - in /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util: SiteWideCache.java WeblogPageCache.java
Date Tue, 01 Aug 2006 22:18:00 GMT
Author: agilliland
Date: Tue Aug  1 15:17:59 2006
New Revision: 427771

URL: http://svn.apache.org/viewvc?rev=427771&view=rev
Log:
couple tweaks to ensure cache key uniqueness.


Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/SiteWideCache.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogPageCache.java

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/SiteWideCache.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/SiteWideCache.java?rev=427771&r1=427770&r2=427771&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/SiteWideCache.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/SiteWideCache.java
Tue Aug  1 15:17:59 2006
@@ -149,9 +149,9 @@
      * Generate a cache key from a parsed weblog page request.
      * This generates a key of the form ...
      *
-     * <handle>[/anchor][/language][/user]
+     * <handle>/<ctx>[/anchor][/language][/user]
      *   or
-     * <handle>[/weblogPage][/date][/category][/language][/user]
+     * <handle>/<ctx>[/weblogPage][/date][/category][/language][/user]
      *
      *
      * examples ...
@@ -179,11 +179,11 @@
                 // ignored
             }
             
-            key.append("/").append(anchor);
+            key.append("/entry/").append(anchor);
         } else {
             
             if(pageRequest.getWeblogPageName() != null) {
-                key.append("/").append(pageRequest.getWeblogPageName());
+                key.append("/page/").append(pageRequest.getWeblogPageName());
             }
             
             if(pageRequest.getWeblogDate() != null) {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogPageCache.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogPageCache.java?rev=427771&r1=427770&r2=427771&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogPageCache.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogPageCache.java
Tue Aug  1 15:17:59 2006
@@ -123,9 +123,9 @@
      * Generate a cache key from a parsed weblog page request.
      * This generates a key of the form ...
      *
-     * <handle>[/anchor][/language][/user]
+     * <handle>/<ctx>[/anchor][/language][/user]
      *   or
-     * <handle>[/weblogPage][/date][/category][/language][/user]
+     * <handle>/<ctx>[/weblogPage][/date][/category][/language][/user]
      *
      *
      * examples ...
@@ -144,6 +144,7 @@
         key.append(pageRequest.getWeblogHandle());
         
         if(pageRequest.getWeblogAnchor() != null) {
+            
             String anchor = null;
             try {
                 // may contain spaces or other bad chars
@@ -152,11 +153,11 @@
                 // ignored
             }
             
-            key.append("/").append(anchor);
+            key.append("/entry/").append(anchor);
         } else {
             
             if(pageRequest.getWeblogPageName() != null) {
-                key.append("/").append(pageRequest.getWeblogPageName());
+                key.append("/page/").append(pageRequest.getWeblogPageName());
             }
             
             if(pageRequest.getWeblogDate() != null) {



Mime
View raw message