vgritsenko 2002/08/03 08:11:04
Modified: src/java/org/apache/cocoon/components/language/markup/xsp/java
util.xsl
Log:
fix include-expr: should use String.valueOf
Revision Changes Path
1.7 +20 -28
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/util.xsl
Index: util.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/util.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- util.xsl 14 Jul 2002 14:49:03 -0000 1.6
+++ util.xsl 3 Aug 2002 15:11:04 -0000 1.7
@@ -155,7 +155,6 @@
-
<!-- Include URL contents as SAX -->
<xsl:template match="util:include-uri">
<xsl:variable name="href">
@@ -201,9 +200,9 @@
</xsl:when>
</xsl:choose>
</xsl:variable>
-
<xsp:logic>
- XSPUtil.includeString(<xsl:copy-of select="$expr"/>,this.manager,
this.contentHandler);
+ XSPUtil.includeString(String.valueOf(<xsl:copy-of select="$expr"/>),
+ this.manager, this.contentHandler);
</xsp:logic>
</xsl:template>
@@ -222,23 +221,21 @@
<xsl:choose>
<xsl:when test="@encoding">
- <xsp:expr>
- XSPUtil.getFileContents(
- XSPUtil.relativeFilename(
- String.valueOf(<xsl:copy-of select="$name"/>),
- this.objectModel
- ), "<xsl:value-of select="@encoding"/>"
- )
- </xsp:expr>
- </xsl:when>
+ <xsp:expr>
+ XSPUtil.getFileContents(
+ XSPUtil.relativeFilename(
+ String.valueOf(<xsl:copy-of select="$name"/>),
+ this.objectModel
+ ), "<xsl:value-of select="@encoding"/>")
+ </xsp:expr>
+ </xsl:when>
<xsl:otherwise>
- <xsp:expr>
- XSPUtil.getFileContents(
- XSPUtil.relativeFilename(
- String.valueOf(<xsl:copy-of select="$name"/>),
- this.objectModel
- ))
- </xsp:expr>
+ <xsp:expr>
+ XSPUtil.getFileContents(
+ XSPUtil.relativeFilename(
+ String.valueOf(<xsl:copy-of select="$name"/>),
+ this.objectModel))
+ </xsp:expr>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
@@ -268,14 +265,9 @@
</xsl:when>
</xsl:choose>
</xsl:variable>
-
<xsp:expr>
- XSPUtil.formatDate(
- new Date(),
- String.valueOf(<xsl:copy-of select="$format"/>).trim()
- )
+ XSPUtil.formatDate(new Date(),
+ String.valueOf(<xsl:copy-of select="$format"/>).trim())
</xsp:expr>
</xsl:template>
-
-
</xsl:stylesheet>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
