Changeset 5636

Timestamp:

2010-07-08 09:13:04 (3 years ago)

Author:

karel

Message:

fix problems with dsyreset parameter introduced yesterday

For logged in users the version mode is now stored in the session
for guest users the version mode is tored in a cookie.
This way we no longer need the dsyreset parameter

Location:

trunk/daisy/applications/daisywiki

Files:

• frontend/src/main/java/org/outerj/daisy/frontend/AddQueryParamsAction.java (deleted)
• frontend/src/main/java/org/outerj/daisy/frontend/DaisyRedirectAction.java (deleted)
• frontend/src/main/java/org/outerj/daisy/frontend/DaisyResetAction.java (deleted)
• frontend/src/main/java/org/outerj/daisy/frontend/FrontEndContext.java (modified) (4 diffs)
• frontend/src/main/java/org/outerj/daisy/frontend/util/ResponseUtil.java (modified) (2 diffs)
• runtime/src/cocoon/webapp/daisy/sitemap.xmap (modified) (7 diffs)

trunk/daisy/applications/daisywiki/frontend/src/main/java/org/outerj/daisy/frontend/FrontEndContext.java

@@ -55 +55 @@
     private String localeAsString;
     private Logger logger;
-    private VersionMode versionMode;
 
     public static final String REQUEST_ATTR_KEY = "daisyFrontEndContext";
@@ -68 +67 @@
         setDaisyCocoonPath(daisyCocoonPath);
         setDaisyContextPath(daisyContextPath);
-
-        Cookie versionModeCookie = (Cookie)request.getCookieMap().get("dsyVersionMode");
-        if (versionModeCookie == null) {
-            versionMode = VersionMode.LIVE;
-        } else {
-            versionMode = VersionMode.get(versionModeCookie.getValue());
-        }
- 
     }
 
@@ -249 +240 @@
 
     public VersionMode getVersionMode() {
-        return versionMode;
+        Session session = request.getSession(false);
+        VersionMode versionMode = null;
+        if (session != null)
+            versionMode = (VersionMode)session.getAttribute("dsyVersionMode");
+
+        if (versionMode != null)
+            return versionMode;
+        
+        Cookie cookie = (Cookie)request.getCookieMap().get("dsyVersionMode");
+        if (cookie != null)
+            return VersionMode.get(cookie.getValue());
+
+        return VersionMode.LIVE;
     }
 
     public void setVersionMode(VersionMode versionMode) {
-        this.versionMode = versionMode;
+        Session session = request.getSession(false);
+        String mode = null;
+        if (session != null) {
+            session.setAttribute("dsyVersionMode", versionMode);
+            return;
+        }
+        
         Cookie c = new HttpCookie("dsyVersionMode", String.valueOf(versionMode));
         response.addCookie(c);
@@ -314 +323 @@
     }
 
-    public void reset() {
-        versionMode = VersionMode.LAST;
-        HttpCookie cookie = (HttpCookie)request.getCookieMap().get("dsyVersionMode");
-        if (cookie != null) {
-            cookie.setValue(versionMode.toString());
-            cookie.setMaxAge(0);
-            response.addCookie(cookie);
-        }
-    }
 }

trunk/daisy/applications/daisywiki/frontend/src/main/java/org/outerj/daisy/frontend/util/ResponseUtil.java

@@ -42 +42 @@
     
     /**
-     * @param request
-     * @param location
-     * @return returns the result of appending the request's query parameters beginning with "dsy" to the location
-     */
-    public static String addDaisyParameters(Request request, String location) {
-        Enumeration<String> params = request.getParameterNames();
-        
-        StringBuffer newLocation = new StringBuffer(location);
-        
-        String separator = "?";
-        if (location.endsWith("?") || location.endsWith("&"))
-            separator = "";
-        else if (location.contains("?")) 
-            separator = "&";
-        
-        while (params.hasMoreElements()) {
-            String param = params.nextElement();
-            if (param.startsWith("dsy")) {
-                for (String paramValue: request.getParameterValues(param)) {
-                    newLocation.append(separator).append(param).append("=").append(paramValue);
-                }
-            }
-        }
-        
-        return newLocation.toString();
-    }
-    /**
      * Redirects to the given location, but give a head-up when the location is a complete URL. (i.e. only relative and absolute paths, which let the user stay on the same host are accepted)
      */
@@ -79 +52 @@
             throw new IllegalArgumentException("Attention! Somebody may be trying to trick you into going to " + location + ".  If you are sure that is not the case, copy the url to the address bar and proceed"); 
         } catch (MalformedURLException me) {
-            response.redirectTo(addDaisyParameters(request.getCocoonRequest(), location));
+            response.redirectTo(location);
         }
     }

trunk/daisy/applications/daisywiki/runtime/src/cocoon/webapp/daisy/sitemap.xmap

@@ -78 +78 @@
     <map:action name="HandleSite" src="org.outerj.daisy.frontend.HandleSiteAction"/>
     <map:action name="SessionInvalidate" src="org.apache.cocoon.acting.SessionInvalidatorAction"/>
-    <map:action name="DaisyReset" src="org.outerj.daisy.frontend.DaisyResetAction"/>
-    <map:action name="DaisyRedirect" src="org.outerj.daisy.frontend.DaisyRedirectAction"/>
-    <map:action name="AddQueryParams" src="org.outerj.daisy.frontend.AddQueryParamsAction"/>
     <map:action name="ResourceExists" src="org.apache.cocoon.acting.ResourceExistsAction"/>
     <map:action name="SetVersionHeader" src="org.outerj.daisy.frontend.SetVersionHeaderAction"/>
@@ -587 +584 @@
         -->
      <map:match pattern="**;jsessionid=**">
-       <map:act type="DaisyRedirect">
-         <map:parameter name="location" value="{1}"/>
-       </map:act>
+       <map:redirect-to uri="{1}"/>
      </map:match>
 
@@ -627 +622 @@
           resources pipeline, since there the cache is controlled by the expires parameter of the map:pipeline -->
      <map:act type="SetCacheHeader"/>
-
-     <!-- Clears cookies if there is a query parameter (dsyreset='true') -->
-     <map:act type="DaisyReset"/>
 
      <!--
@@ -654 +646 @@
 
      <map:match pattern="admin">
-       <map:act type="DaisyRedirect">
-         <map:parameter name="location" value="admin/"/>
-         <map:parameter name="global" value="true/"/>
-       </map:act>
+       <map:redirect-to uri="admin/" global="true"/>
      </map:match>
 
@@ -734 +723 @@
      <map:match pattern="logout">
        <map:act type="SessionInvalidate"/>
-       <map:act type="AddQueryParams">
-         <map:parameter name="baseUri" value=""/>
-         <map:parameter name="queryParams" value="dsyreset=true"/>
-       </map:act>
-       <map:act type="DaisyRedirect">
-         <map:parameter name="location" value="{request-attr:redirectUri}"/>
-       </map:act>
+       <map:redirect-to uri=""/>
      </map:match>
 
@@ -756 +739 @@
 
      <map:match pattern="books">
-       <map:act type="DaisyRedirect">
-         <map:parameter name="location" value="books/"/>
-       </map:act>
+       <map:redirect-to uri="books/"/>
      </map:match>
 
@@ -790 +771 @@
 
        <map:match pattern="*/">
-         <map:act type="DaisyRedirect">
-           <map:parameter name="location" value="{request:getAttribute(., 'siteConf')/homePage}"/>
-         </map:act>
+         <map:redirect-to uri="{request:getAttribute(., 'siteConf')/homePage}"/>
        </map:match>
 
        <map:match pattern="*/logout">
          <map:act type="SessionInvalidate"/>
-         <map:act type="AddQueryParams">
-           <map:parameter name="baseUri" value=""/>
-           <map:parameter name="queryParams" value="dsyreset=true"/>
-         </map:act>
-         <map:act type="DaisyRedirect">
-           <map:parameter name="location" value="{request-attr:redirectUri}"/>
-         </map:act>
+         <map:redirect-to uri=""/>
        </map:match>