--- trunk/contrib/convert-choices.xsl	2007/08/10 23:19:45	30
+++ trunk/contrib/convert-choices.xsl	2007/08/11 11:24:04	31
@@ -11,25 +11,12 @@
 
 	<xsl:template match="choice">
 		<choice>
-		<!-- iterate over all attributes -->
-		<xsl:for-each select="@*">
-			<xsl:choose>
-				<xsl:when test="name() = 'value' and current() = ''"/>
-					<!-- ignore old value attribute -->
-				<xsl:when test="name() = 'options'">
-					<!-- save old options attribute as value -->
-					<xsl:attribute name="value">
-						<xsl:value-of select="."/>
-					</xsl:attribute> 
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- copy thru all other attributes -->
-					<xsl:attribute name="{name()}">
-						<xsl:value-of select="."/>
-					</xsl:attribute> 
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:for-each>
+			<!-- copy all attributes except 'value' and 'options' -->
+			<xsl:copy-of select="@*[local-name() != 'value' and local-name() != 'options']"/>
+			<!-- generate 'value' attribute with value of 'options' -->
+			<xsl:attribute name="value">
+				<xsl:value-of select="@options"/>
+			</xsl:attribute> 
 		</choice>
 	</xsl:template>