You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dm...@apache.org on 2002/09/24 21:53:37 UTC
cvs commit: xml-xalan/test/tests/conf/axes axes113.xsl
dmarston 2002/09/24 12:53:37
Modified: test/tests/conf/axes axes113.xsl
Log:
Improve handling of attribute::* to make results matchable
Revision Changes Path
1.3 +9 -19 xml-xalan/test/tests/conf/axes/axes113.xsl
Index: axes113.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/axes/axes113.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- axes113.xsl 13 May 2002 15:52:23 -0000 1.2
+++ axes113.xsl 24 Sep 2002 19:53:37 -0000 1.3
@@ -8,7 +8,6 @@
<!-- Purpose: Comprehensive test of all axes -->
<!-- Author: Dave Haffner -->
-
<xsl:strip-space elements="*"/>
<xsl:template match="//a[@id='36']">
@@ -17,7 +16,6 @@
<xsl:value-of select="./@id"/>
<xsl:text>: </xsl:text>
-
<xsl:call-template name="displayNodes">
<xsl:with-param name="nodeList" select="parent::*" />
<xsl:with-param name="axisName" select="'parent::*'" />
@@ -68,10 +66,15 @@
<xsl:with-param name="axisName" select="'ancestor-or-self::*'" />
</xsl:call-template>
- <xsl:call-template name="displayAttributeNodes">
- <xsl:with-param name="nodeList" select="attribute::*" />
- <xsl:with-param name="axisName" select="'attribute::*'" />
- </xsl:call-template>
+ <!-- Special handling for attribute axis. -->
+ <xsl:text> Axis: attribute::* (sorted): </xsl:text>
+ <xsl:for-each select="attribute::*" >
+ <xsl:sort select="name()"/>
+ <xsl:value-of select="name()"/>
+ <xsl:text>: </xsl:text>
+ <xsl:value-of select="."/>
+ <xsl:text>, </xsl:text>
+ </xsl:for-each>
</out>
</xsl:template>
@@ -82,19 +85,6 @@
<xsl:text>: </xsl:text>
<xsl:for-each select="$nodeList" >
<xsl:value-of select="@id"/>
- <xsl:text>,</xsl:text>
- </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="displayAttributeNodes">
- <xsl:param name="nodeList" select="/.."/>
- <xsl:param name="axisName" select="''" />
- Axis: <xsl:value-of select="$axisName"/>
- <xsl:text>: </xsl:text>
- <xsl:for-each select="$nodeList" >
- <xsl:value-of select="name()"/>
- <xsl:text> : </xsl:text>
- <xsl:value-of select="."/>
<xsl:text>,</xsl:text>
</xsl:for-each>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org