cvs commit: xml-cocoon2/src/org/apache/cocoon/acting RequestParamAction.java

[cziegeler]

cziegeler    01/09/26 06:16:20

  Modified:    src/org/apache/cocoon/acting Tag: cocoon_20_branch
                        RequestParamAction.java
  Log:
  Default value support for RequestParamAction
  Submitted by: Sergio Carvalho [[EMAIL PROTECTED]]
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.6   +18 -1     xml-cocoon2/src/org/apache/cocoon/acting/RequestParamAction.java
  
  Index: RequestParamAction.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/RequestParamAction.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- RequestParamAction.java   2001/08/22 12:08:20     1.1.2.5
  +++ RequestParamAction.java   2001/09/26 13:16:20     1.1.2.6
  @@ -38,6 +38,9 @@
    * (A variable is created for each request parameter (only if it doesn't exist)
    * with the same name as the parameter itself)
    *
  + * Default values can be set for request parameters, by including sitemap parameters
  + * named "default.<parameter-name>".
  + *
    * Sitemap definition:
    *
    * <pre>
  @@ -52,6 +55,7 @@
    * &lt;map:match pattern="some-resource"&gt;
    *  &lt;map:act type="request"&gt;
    *     &lt;map:parameter name="parameters" value="true"/&gt;
  + *     &lt;map:parameter name="default.dest" value="invalid-destination.html"/&gt;
    *     &lt;map:redirect-to uri="{context}/somewhereelse/{dest}"/&gt;
    *  &lt;/map:act&gt;
    * &lt;/map:match&gt;
  @@ -74,7 +78,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Torsten Curdt</a>
  - * @version CVS $Revision: 1.1.2.5 $
  + * @version CVS $Revision: 1.1.2.6 $
    */
   public class RequestParamAction extends ComposerAction implements ThreadSafe {
   
  @@ -83,6 +87,8 @@
       public final static String MAP_CONTEXTPATH = "context";
    
       public final static String PARAM_PARAMETERS = "parameters";
  +    public final static String PARAM_DEFAULT_PREFIX = "default.";
  +
    
       public Map act( Redirector redirector, SourceResolver resolver, Map 
objectModel, String source, Parameters param )
           throws Exception
  @@ -113,10 +119,21 @@
             while(e.hasMoreElements()){
               String name = (String) e.nextElement();
               String value = request.getParameter(name);
  +
               if (value != null && !map.containsKey(name)){
                 map.put(name, value);
               }
             }
  +       
  +       String[] paramNames = param.getNames();
  +          for (int i=0; i< paramNames.length; i++) {
  +           if (paramNames[i].startsWith(PARAM_DEFAULT_PREFIX) &&
  +               
(request.getParameter(paramNames[i].substring(PARAM_DEFAULT_PREFIX.length())) == 
null)) {
  +               map.put(paramNames[i].substring(PARAM_DEFAULT_PREFIX.length()), 
param.getParameter(paramNames[i]));
  +           }
  +       }
  +
  +
           }
    
           return(map);
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]