sylvain 01/12/06 05:57:24 Modified: src/org/apache/cocoon/components/language/markup/sitemap/java sitemap.xsl Log: Bug in sitemap.xsl Submitted by: [EMAIL PROTECTED] Revision Changes Path 1.50 +4 -4 xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl Index: sitemap.xsl =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sitemap.xsl 2001/11/26 14:39:40 1.49 +++ sitemap.xsl 2001/12/06 13:57:24 1.50 @@ -126,7 +126,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a> * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> - * @version CVS $Id: sitemap.xsl,v 1.49 2001/11/26 14:39:40 haul Exp $ + * @version CVS $Id: sitemap.xsl,v 1.50 2001/12/06 13:57:24 sylvain Exp $ */ public class <xsl:value-of select="@file-name"/> extends AbstractSitemap { static final String LOCATION = "<xsl:value-of select="translate(@file-path, '/', '.')"/>.<xsl:value-of select="@file-name"/>"; @@ -427,7 +427,7 @@ <xsl:if test="not(XSLTFactoryLoader:isFactory($factory-loader, string($src)))"> <xsl:choose> - <xsl:when test="XSLTFactoryLoader:hasSubstitutions(@pattern)"> + <xsl:when test="XSLTFactoryLoader:hasSubstitutions($factory-loader, @pattern)"> // Pattern "<xsl:value-of select="@pattern"/>" has substitutions and is not prepared. </xsl:when> <xsl:otherwise> @@ -828,7 +828,7 @@ <xsl:value-of select="translate($matcher-type, '- ', '__')"/>Match(<xsl:value-of select="$matcher-name2"/>_expr, objectModel, <xsl:value-of select="$component-param"/>) </xsl:when> <xsl:otherwise> - matches("<xsl:value-of select="$matcher-type"/>", <xsl:value-of select="$matcher-name2"/>_expr, "<xsl:value-of select="XSLTFactoryLoader:escape($pattern-value)"/>", listOfMaps, <xsl:value-of select="$component-param"/>, objectModel) + matches("<xsl:value-of select="$matcher-type"/>", <xsl:value-of select="$matcher-name2"/>_expr, "<xsl:value-of select="XSLTFactoryLoader:escape($factory-loader, $pattern-value)"/>", listOfMaps, <xsl:value-of select="$component-param"/>, objectModel) </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -918,7 +918,7 @@ </xsl:when> <xsl:otherwise> - <xsl:text>matches("</xsl:text><xsl:value-of select="$matcher-type"/>", <xsl:value-of select="$matcher-name2"/>_expr, "<xsl:value-of select="XSLTFactoryLoader:escape($pattern-value)"/>", listOfMaps, <xsl:value-of select="$component-param"/><xsl:text>, objectModel)</xsl:text> + <xsl:text>matches("</xsl:text><xsl:value-of select="$matcher-type"/>", <xsl:value-of select="$matcher-name2"/>_expr, "<xsl:value-of select="XSLTFactoryLoader:escape($factory-loader, $pattern-value)"/>", listOfMaps, <xsl:value-of select="$component-param"/><xsl:text>, objectModel)</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:variable>
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]