haul        01/11/26 01:38:16

  Modified:    src/org/apache/cocoon/components/language/markup/xsp/java
                        esql.xsl
  Log:
  Pach from Frank Taffelt,
  esql.xsl produced wrong function calls for the ESQL* classes if jdbc-connection 
parameters are specified
  
  Revision  Changes    Path
  1.25      +4 -4      
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
  
  Index: esql.xsl
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/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  2001/11/20 12:33:55     1.24
  +++ esql.xsl  2001/11/26 09:38:16     1.25
  @@ -1,5 +1,5 @@
   <?xml version="1.0"?>
  -<!-- $Id: esql.xsl,v 1.24 2001/11/20 12:33:55 haul Exp $-->
  +<!-- $Id: esql.xsl,v 1.25 2001/11/26 09:38:16 haul Exp $-->
   <!--
   
    ============================================================================
  @@ -376,12 +376,12 @@
                 _esql_connection.setUser(String.valueOf(<xsl:copy-of 
select="$username"/>));
               </xsl:if>
               <xsl:if test="esql:password">
  -              _esql_connection.setPassword("password", String.valueOf(<xsl:copy-of 
select="$password"/>));
  +              _esql_connection.setPassword(String.valueOf(<xsl:copy-of 
select="$password"/>));
               </xsl:if>
               <xsl:for-each select="esql:property">
                 _esql_connection.setProperty("<xsl:value-of 
select="@name"/>",<xsl:call-template name="get-nested-string"><xsl:with-param 
name="content" select="."/></xsl:call-template>);
               </xsl:for-each>
  -            _esql_connection.connection = 
DriverManager.getConnection(_esql_connection.dburl, _esql_connection.info);
  +            _esql_connection.connection = 
DriverManager.getConnection(_esql_connection.getUrl(), _esql_connection.getInfo());
             } catch (Exception _esql_exception_<xsl:value-of 
select="generate-id(.)"/>) {
               throw new RuntimeException("Error opening connection to dburl: 
"+String.valueOf(<xsl:copy-of select="$dburl"/>)+": "+_esql_exception_<xsl:value-of 
select="generate-id(.)"/>.getMessage());
             }
  @@ -968,7 +968,7 @@
   
   <xspdoc:desc>returns the position of the current row in the result set</xspdoc:desc>
   <xsl:template 
match="esql:row-results//esql:get-row-position|esql:results//esql:get-row-position">
  -  <xsp:expr>_esql_query.position</xsp:expr>
  +  <xsp:expr>_esql_query.getCurrentRow()</xsp:expr>
   </xsl:template>
   
   <xspdoc:desc>returns the name of the given column. the column mus tbe specified by 
number, not name.</xspdoc:desc>
  
  
  

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

Reply via email to