haul 02/05/07 01:08:29
Modified: src/java/org/apache/cocoon/components/language/markup/xsp/java
esql.xsl
Log:
Patch from [EMAIL PROTECTED] (Michael Enke)
resolves patch #8557
I added a null attribute to <esql:get-columns/> and <esql:get-string/>
Now it is possible to write e.g.
<esql:get-columns null="value is null"/>
or
<esql:get-string null=""/>
Revision Changes Path
1.19 +8 -5
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- esql.xsl 19 Apr 2002 18:18:38 -0000 1.18
+++ esql.xsl 7 May 2002 08:08:29 -0000 1.19
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.18 2002/04/19 18:18:38 froehlich Exp $-->
+<!-- $Id: esql.xsl,v 1.19 2002/05/07 08:08:29 haul Exp $-->
<!--
============================================================================
@@ -56,7 +56,7 @@
* ESQL Logicsheet
*
* @author ?
- * @version CVS $Revision: 1.18 $ $Date: 2002/04/19 18:18:38 $
+ * @version CVS $Revision: 1.19 $ $Date: 2002/05/07 08:08:29 $
-->
<xsl:stylesheet version="1.0"
@@ -726,6 +726,7 @@
<xsp:content>
<xsp:expr>
<xsl:call-template name="get-string-encoded">
+ <xsl:with-param name="null"><xsl:value-of
select="@null"/></xsl:with-param>
<xsl:with-param name="column-spec">_esql_i</xsl:with-param>
<xsl:with-param
name="resultset">_esql_query.getResultSet()</xsl:with-param>
</xsl:call-template>
@@ -742,6 +743,7 @@
<xsl:template
match="esql:row-results//esql:get-string|esql:call-results//esql:get-string"
name="get-string">
<xsp:expr>
<xsl:call-template name="get-string-encoded">
+ <xsl:with-param name="null"><xsl:value-of select="@null"/></xsl:with-param>
<xsl:with-param name="column-spec"><xsl:call-template
name="get-column"/></xsl:with-param>
<xsl:with-param name="resultset"><xsl:call-template
name="get-resultset"/></xsl:with-param>
</xsl:call-template>
@@ -1049,6 +1051,7 @@
<xsl:template name="get-string-encoded">
<xsl:param name="column-spec"/>
<xsl:param name="resultset"/>
+ <xsl:param name="null"/>
<xsl:variable name="encoding">
<xsl:choose>
<xsl:when test="@encoding">"<xsl:value-of select="@encoding"/>"</xsl:when>
@@ -1060,15 +1063,15 @@
<xsl:otherwise>default</xsl:otherwise>
</xsl:choose>
</xsl:variable>
+ <xsl:value-of select="$resultset"/>.getBytes(<xsl:value-of
select="$column-spec"/>)
+ == null ? "<xsl:value-of select="$null"/>" :
<xsl:choose>
<xsl:when test="$encoding = 'default'">
<xsl:value-of select="$resultset"/>.getString(<xsl:value-of
select="$column-spec"/>)
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="$resultset"/>.getBytes(<xsl:value-of
select="$column-spec"/>)
- != null ? EsqlHelper.getStringFromByteArray(<xsl:value-of
select="$resultset"/>.getBytes
+ EsqlHelper.getStringFromByteArray(<xsl:value-of select="$resultset"/>.getBytes
(<xsl:value-of select="$column-spec"/>), <xsl:value-of select="$encoding"/>)
- : ""
</xsl:otherwise>
</xsl:choose>
</xsl:template>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
