haul 2003/09/05 06:01:01
Modified:
src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java
esql.xsl
Log:
fix @resultset-from-object for calls to SP reported by Martin Rusnak
<martin.rusnak.at.voipac.com>
Revision Changes Path
1.5 +8 -3
cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
Index: esql.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- esql.xsl 4 Aug 2003 13:41:46 -0000 1.4
+++ esql.xsl 5 Sep 2003 13:01:01 -0000 1.5
@@ -460,6 +460,11 @@
</xsl:template>
+<xspdoc:descr>Internal helper to select the resultset-from-object attribute
of the nested esql:call element.</xspdoc:descr>
+<xsl:template match="esql:call" mode="resultset">
+ <xsl:value-of select="@resultset-from-object"/>
+</xsl:template>
+
<xsl:template match="esql:connection//esql:execute-query">
<xsl:variable name="query"><xsl:choose><xsl:when
test="esql:query"><xsl:call-template name="get-nested-string"><xsl:with-param
name="content" select="esql:query"/></xsl:call-template></xsl:when><xsl:when
test="esql:call"><xsl:call-template name="get-nested-string"><xsl:with-param
name="content"
select="esql:call"/></xsl:call-template></xsl:when></xsl:choose></xsl:variable>
@@ -499,7 +504,7 @@
</xsl:for-each>
<xsl:choose>
<xsl:when test="esql:[EMAIL PROTECTED]'true' or
@needs-query='yes']">_esql_query.execute(true);</xsl:when>
- <xsl:when test="esql:[EMAIL
PROTECTED]">_esql_query.execute(<xsl:copy-of select="esql:[EMAIL
PROTECTED]"/>);</xsl:when>
+ <xsl:when test="esql:[EMAIL
PROTECTED]">_esql_query.execute(<xsl:apply-templates select="esql:call"
mode="resultset"/>);</xsl:when>
<xsl:otherwise>_esql_query.execute();</xsl:otherwise>
</xsl:choose>
</xsl:when>
