haul 2003/06/03 07:34:30
Modified: src/java/org/apache/cocoon/components/language/markup/xsp/java util.xsl Log: make <util:include-expr expr="foo"/> treat foo as java expression, not as string literal make <util:include-expr><util:expr>foo</util:expr></util:include-expr> sufficient, ie. no need to write <xsp:expr>foo</xsp:expr> Revision Changes Path 1.4 +4 -4 cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/java/util.xsl Index: util.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/java/util.xsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- util.xsl 13 Mar 2003 14:13:08 -0000 1.3 +++ util.xsl 3 Jun 2003 14:34:29 -0000 1.4 @@ -194,9 +194,9 @@ <xsl:template match="util:include-expr"> <xsl:variable name="expr"> <xsl:choose> - <xsl:when test="@expr">"<xsl:value-of select="@expr"/>"</xsl:when> + <xsl:when test="@expr"><xsl:value-of select="@expr"/></xsl:when> <xsl:when test="util:expr"> - <xsl:apply-templates select="util:expr/*|util:expr/text()"/> + <xsp:expr><xsl:apply-templates select="util:expr/*|util:expr/text()"/></xsp:expr> </xsl:when> </xsl:choose> </xsl:variable>