You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2001/07/06 18:29:02 UTC
cvs commit: xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java sitemap.xsl
vgritsenko 01/07/06 09:29:02
Modified: src/org/apache/cocoon/components/language/markup/sitemap/java
sitemap.xsl
Log:
Patch from Christian Haul [haul@dvs1.informatik.tu-darmstadt.de] for bug#2419
Revision Changes Path
1.24 +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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sitemap.xsl 2001/06/28 10:48:33 1.23
+++ sitemap.xsl 2001/07/06 16:29:02 1.24
@@ -128,7 +128,7 @@
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Id: sitemap.xsl,v 1.23 2001/06/28 10:48:33 cziegeler Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.24 2001/07/06 16:29:02 vgritsenko 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"/>";
@@ -161,7 +161,7 @@
<xsl:variable name="matcher-name">
<xsl:call-template name="generate-name">
<xsl:with-param name="prefix">matcher_</xsl:with-param>
- <xsl:with-param name="suffix"><xsl:value-of select="$type"/>_<xsl:value-of select="generate-id(.)"/></xsl:with-param>
+ <xsl:with-param name="suffix"><xsl:value-of select="$name"/>_<xsl:value-of select="generate-id(.)"/></xsl:with-param>
</xsl:call-template>
</xsl:variable>
// The generated matcher for a pattern of "<xsl:value-of select="@pattern"/>"
@@ -182,7 +182,7 @@
<xsl:variable name="type" select="translate(@name, '- ', '__')"/>
<xsl:variable name="default" select="@name = ../@default"/>
<xsl:variable name="config" select="descendant-or-self::*"/>
- private boolean <xsl:value-of select="$name"/>Select (<xsl:value-of select="XSLTFactoryLoader:getParameterSource($factory-loader, string($src),$config)"/> pattern, Map objectModel, Parameters param) {
+ private boolean <xsl:value-of select="$type"/>Select (<xsl:value-of select="XSLTFactoryLoader:getParameterSource($factory-loader, string($src),$config)"/> pattern, Map objectModel, Parameters param) {
<xsl:value-of select="XSLTFactoryLoader:getMethodSource($factory-loader, string($src),$config)"/>
}
<xsl:for-each select="/map:sitemap/map:pipelines/map:pipeline/descendant::map:select[@type=$name or (not(@type) and $default)]/map:when">
@@ -190,7 +190,7 @@
<xsl:variable name="selector-name">
<xsl:call-template name="generate-name">
<xsl:with-param name="prefix">selector_</xsl:with-param>
- <xsl:with-param name="suffix"><xsl:value-of select="$type"/>_<xsl:value-of select="generate-id(.)"/></xsl:with-param>
+ <xsl:with-param name="suffix"><xsl:value-of select="$name"/>_<xsl:value-of select="generate-id(.)"/></xsl:with-param>
</xsl:call-template>
</xsl:variable>
<!-- produce a definition for this test string -->
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org