# HG changeset patch
# User paulb
# Date 1128474252 0
# Node ID 56afb296234f594db88c398d0ebfeaccb23c52d3
# Parent  2cd13aa954972c29ab07371d4a594fad8a0fb9c8
[project @ 2005-10-05 01:04:12 by paulb]
Fixed multiple-choice-field.

diff -r 2cd13aa95497 -r 56afb296234f XSLForms/XSL/Schema.xsl
--- a/XSLForms/XSL/Schema.xsl	Tue Oct 04 23:47:41 2005 +0000
+++ b/XSLForms/XSL/Schema.xsl	Wed Oct 05 01:04:12 2005 +0000
@@ -140,13 +140,22 @@
       </xsl:when>
       <xsl:when test="@template:multiple-choice-field">
         <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-field, ',')"/>
-        <xsl:variable name="field-attr" select="substring-after(@template:multiple-choice-field, ',')"/>
+        <xsl:variable name="field-attr-info" select="substring-after(@template:multiple-choice-field, ',')"/>
+        <xsl:variable name="field-attr" select="substring-before($field-attr-info, ',')"/>
+        <xsl:variable name="field-attr-type" select="substring-after($field-attr-info, ',')"/>
         <xsl:choose>
           <xsl:when test="$field-element != '-'">
             <element type="multiple-choice">
               <xsl:attribute name="name"><xsl:value-of select="$field-element"/></xsl:attribute>
               <attribute>
-                <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
+                <xsl:choose>
+                  <xsl:when test="$field-attr != ''">
+                    <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:attribute name="name"><xsl:value-of select="$field-attr-info"/></xsl:attribute>
+                  </xsl:otherwise>
+                </xsl:choose>
               </attribute>
               <xsl:apply-templates select="*"/>
             </element>
@@ -154,7 +163,14 @@
           <xsl:otherwise>
             <xsl:attribute name="type">multiple-choice</xsl:attribute>
             <attribute>
-              <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
+              <xsl:choose>
+                <xsl:when test="$field-attr != ''">
+                  <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:attribute name="name"><xsl:value-of select="$field-attr-info"/></xsl:attribute>
+                </xsl:otherwise>
+              </xsl:choose>
             </attribute>
             <xsl:apply-templates select="*"/>
           </xsl:otherwise>