Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
Date: 22 May 2002 09:23:48 -0000
Message-ID: <20020522092348.46959.qmail@icarus.apache.org>
From: haul@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit:
 xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java
 esql.xsl

haul        02/05/22 02:23:48

  Modified:    src/java/org/apache/cocoon/components/language/markup/xsp/java
                        esql.xsl
  Log:
  Changed order of evaluation of call-results and other results as neil
  pointed out that out parameters need to be processed first.
  
  Revision  Changes    Path
  1.25      +6 -4      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
  
  Index: esql.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- esql.xsl	21 May 2002 19:37:44 -0000	1.24
  +++ esql.xsl	22 May 2002 09:23:48 -0000	1.25
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<!-- $Id: esql.xsl,v 1.24 2002/05/21 19:37:44 haul Exp $-->
  +<!-- $Id: esql.xsl,v 1.25 2002/05/22 09:23:48 haul Exp $-->
   <!--
   
    ============================================================================
  @@ -56,7 +56,7 @@
    * ESQL Logicsheet
    *
    * @author ?
  - * @version CVS $Revision: 1.24 $ $Date: 2002/05/21 19:37:44 $
  + * @version CVS $Revision: 1.25 $ $Date: 2002/05/22 09:23:48 $
   -->
   
   <xsl:stylesheet version="1.0"
  @@ -486,6 +486,9 @@
           </xsl:otherwise>
         </xsl:choose>
         getLogger().debug("esql query: " + _esql_query.getQueryString());
  +
  +      <xsl:call-template name="do-results"/>
  +
         <xsl:if test="esql:call">
           // call results
           <xsp:content>
  @@ -493,9 +496,8 @@
           </xsp:content>
         </xsl:if>
   
  -      <xsl:call-template name="do-results"/>
  -
         _esql_query.getStatement().close();
  +
       } catch (SQLException _esql_exception_<xsl:value-of select="generate-id(.)"/>) {
           <xsl:choose>
             <xsl:when test="esql:error-results">
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org