Index: esql.xsl
===================================================================
RCS file: /home/cvspublic/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
retrieving revision 1.24
diff -u -r1.24 esql.xsl
--- esql.xsl	2001/11/20 12:33:55	1.24
+++ esql.xsl	2001/11/23 16:56:53
@@ -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>