cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sylv...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap CallFunctionNode.java
Date Sat, 16 Aug 2003 20:38:30 GMT
sylvain     2003/08/16 13:38:30

  Modified:    src/java/org/apache/cocoon/components/treeprocessor/sitemap
                        CallFunctionNode.java
  Log:
  Prevent strange "incomplete pipeline" messages if the flow does no sendPage[andWait]()
  Should a RNFE be thrown in that case ?
  
  Revision  Changes    Path
  1.3       +115 -129  cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java
  
  Index: CallFunctionNode.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CallFunctionNode.java	16 Mar 2003 17:49:13 -0000	1.2
  +++ CallFunctionNode.java	16 Aug 2003 20:38:30 -0000	1.3
  @@ -60,6 +60,7 @@
   import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
   import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
   import org.apache.cocoon.environment.Environment;
  +import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.sitemap.PatternException;
   
   /**
  @@ -70,133 +71,118 @@
    * @since March 13, 2002
    * @version CVS $Id$
    */
  -public class CallFunctionNode extends AbstractProcessingNode
  -  implements Configurable, Composable
  -{
  -  protected String functionName;
  -  protected String continuationId;
  -  protected List parameters;
  -  protected VariableResolver functionNameResolver;
  -  protected VariableResolver continuationResolver;
  -  protected ComponentManager manager;
  -  protected Interpreter interpreter;
  -
  -  public static List resolveList(List expressions, ComponentManager manager, InvokeContext
context, Map objectModel)
  -    throws PatternException
  -  {
  -    int size;
  -    if (expressions == null || (size = expressions.size()) == 0)
  -      return Collections.EMPTY_LIST;
  -
  -    List result = new ArrayList(size);
  -
  -    for (int i = 0; i < size; i++) {
  -      Interpreter.Argument arg = (Interpreter.Argument)expressions.get(i);
  -      String value = VariableResolverFactory.getResolver(arg.value, manager).resolve(context,
objectModel);
  -      result.add (new Interpreter.Argument(arg.name, value));
  -    }
  -
  -    return result;
  -  }
  -
  -  public CallFunctionNode(String funName, String contId)
  -  {
  -    functionName = funName;
  -    continuationId = contId;
  -  }
  -
  -  public void setInterpreter(Interpreter interp)
  -    throws Exception
  -  {
  -    this.interpreter = interp;
  -  }
  -
  -  /**
  -   * Obtain the configuration specific to this node type and update
  -   * the internal state.
  -   *
  -   * @param config a <code>Configuration</code> value
  -   * @exception ConfigurationException if an error occurs
  -   */
  -  public void configure(Configuration config)
  -    throws ConfigurationException
  -  {
  -    parameters = new ArrayList();
  -
  -    Configuration[] params = config.getChildren("parameter");
  -    for (int i = 0; i < params.length; i++) {
  -      Configuration param = params[i];
  -      String name = param.getAttribute("name", null);
  -      String value = param.getAttribute("value", null);
  -      parameters.add(new Interpreter.Argument(name, value));
  -    }
  -
  -    try {
  -      // Check to see if we need to resolve the function name or the
  -      // continuation id at runtime
  -      if (functionName != null
  -          && VariableResolverFactory.needsResolve(functionName))
  -        functionNameResolver
  -          = VariableResolverFactory.getResolver(functionName, manager);
  -
  -      if (continuationId != null
  -          && VariableResolverFactory.needsResolve(continuationId))
  -        continuationResolver
  -          = VariableResolverFactory.getResolver(continuationId, manager);
  -    }
  -    catch (PatternException ex) {
  -      throw new ConfigurationException(ex.toString());
  -    }
  -  }
  -
  -  public void compose(ComponentManager manager)
  -  {
  -    this.manager = manager;
  -  }
  -
  -  public boolean invoke(Environment env, InvokeContext context)
  -      throws Exception
  -  {
  -    List params = null;
  -
  -    // Resolve parameters
  -    if (parameters != null)
  -      params = resolveList(parameters, manager, context,
  -                           env.getObjectModel());
  -
  -    String continuation;
  -    if (continuationResolver != null) {
  -      // Need to resolve the function name at runtime
  -      continuation = continuationResolver.resolve(context,
  -                                                  env.getObjectModel());
  -    }
  -    else
  -      continuation = continuationId;
  -
  -    // If the continuation id is not null, it takes precedence over
  -    // the function call, so we invoke it here.
  -    if (continuation != null) {
  -      interpreter.handleContinuation(continuation, params, env);
  -      return true;
  -    }
  -
  -    // We don't have a continuation id passed in <map:call>, so invoke
  -    // the specified function
  -
  -    String name;
  -    if (functionNameResolver != null) {
  -      // Need to resolve the function name at runtime
  -      name = functionNameResolver.resolve(context,
  -                                          env.getObjectModel());
  -    }
  -    else
  -      name = functionName;
  -
  -    if (name != null) {
  -      interpreter.callFunction(name, params, env);
  -      return true;
  -    }
  +public class CallFunctionNode extends AbstractProcessingNode implements Configurable, Composable
{
  +    protected String functionName;
  +    protected String continuationId;
  +    protected List parameters;
  +    protected VariableResolver functionNameResolver;
  +    protected VariableResolver continuationResolver;
  +    protected ComponentManager manager;
  +    protected Interpreter interpreter;
  +
  +    public static List resolveList(List expressions, ComponentManager manager, InvokeContext
context, Map objectModel)
  +        throws PatternException {
  +        int size;
  +        if (expressions == null || (size = expressions.size()) == 0)
  +            return Collections.EMPTY_LIST;
  +
  +        List result = new ArrayList(size);
  +
  +        for (int i = 0; i < size; i++) {
  +            Interpreter.Argument arg = (Interpreter.Argument)expressions.get(i);
  +            String value = VariableResolverFactory.getResolver(arg.value, manager).resolve(context,
objectModel);
  +            result.add(new Interpreter.Argument(arg.name, value));
  +        }
  +
  +        return result;
  +    }
  +
  +    public CallFunctionNode(String funName, String contId) {
  +        functionName = funName;
  +        continuationId = contId;
  +    }
  +
  +    public void setInterpreter(Interpreter interp) throws Exception {
  +        this.interpreter = interp;
  +    }
  +
  +    /**
  +     * Obtain the configuration specific to this node type and update
  +     * the internal state.
  +     *
  +     * @param config a <code>Configuration</code> value
  +     * @exception ConfigurationException if an error occurs
  +     */
  +    public void configure(Configuration config) throws ConfigurationException {
  +        parameters = new ArrayList();
  +
  +        Configuration[] params = config.getChildren("parameter");
  +        for (int i = 0; i < params.length; i++) {
  +            Configuration param = params[i];
  +            String name = param.getAttribute("name", null);
  +            String value = param.getAttribute("value", null);
  +            parameters.add(new Interpreter.Argument(name, value));
  +        }
  +
  +        try {
  +            // Check to see if we need to resolve the function name or the
  +            // continuation id at runtime
  +            if (functionName != null && VariableResolverFactory.needsResolve(functionName))
  +                functionNameResolver = VariableResolverFactory.getResolver(functionName,
manager);
  +
  +            if (continuationId != null && VariableResolverFactory.needsResolve(continuationId))
  +                continuationResolver = VariableResolverFactory.getResolver(continuationId,
manager);
  +        } catch (PatternException ex) {
  +            throw new ConfigurationException(ex.toString());
  +        }
  +    }
  +
  +    public void compose(ComponentManager manager) {
  +        this.manager = manager;
  +    }
  +
  +    public boolean invoke(Environment env, InvokeContext context) throws Exception {
  +        Redirector redirector = PipelinesNode.getRedirector(env);
  +        
  +        List params = null;
  +
  +        // Resolve parameters
  +        if (parameters != null)
  +            params = resolveList(parameters, manager, context, env.getObjectModel());
  +
  +        String continuation;
  +        if (continuationResolver != null) {
  +            // Need to resolve the function name at runtime
  +            continuation = continuationResolver.resolve(context, env.getObjectModel());
  +        } else {
  +            continuation = continuationId;
  +        }
  +
  +        // If the continuation id is not null, it takes precedence over
  +        // the function call, so we invoke it here.
  +        if (continuation != null) {
  +            interpreter.handleContinuation(continuation, params, env);
  +            // FIXME (SW) : is a flow allowed not to redirect ?
  +            // If not, we should throw a RNFE here.
  +            return redirector.hasRedirected();
  +        }
  +
  +        // We don't have a continuation id passed in <map:call>, so invoke
  +        // the specified function
  +
  +        String name;
  +        if (functionNameResolver != null) {
  +            // Need to resolve the function name at runtime
  +            name = functionNameResolver.resolve(context, env.getObjectModel());
  +        } else
  +            name = functionName;
  +
  +        if (name != null) {
  +            interpreter.callFunction(name, params, env);
  +            // FIXME (SW) : is a flow allowed not to redirect ?
  +            return redirector.hasRedirected();
  +        }
   
  -    return false;
  -  }
  +        return false;
  +    }
   }
  
  
  

Mime
View raw message