# HG changeset patch
# User paulb
# Date 1134337519 0
# Node ID b1e5451b3ad84736105da9e054dddb8c6cb23296
# Parent  8b7ede8ec9e4cf3876b211319094157295e17e4a
[project @ 2005-12-11 21:45:19 by paulb]
Fixed Schema in order to bring it up to date with recent multiple-choice
value changes.
Added dynamic multiple-choice value source support to Input, PrepareMacro
and Schema.

diff -r 8b7ede8ec9e4 -r b1e5451b3ad8 XSLForms/XSL/Input.xsl
--- a/XSLForms/XSL/Input.xsl	Sat Jun 21 01:38:50 2008 +0200
+++ b/XSLForms/XSL/Input.xsl	Sun Dec 11 21:45:19 2005 +0000
@@ -233,21 +233,31 @@
     </xsl:if>
 
     <!-- Select inside the enumeration source, inside an element with the field's name, the enumeration elements. -->
-    <!-- NOTE: We could avoid dyn:evaluate if we were certain that a document reference was being used. -->
-    <!-- NOTE: However, we may want to be able to refer to other places within the document, and this requires -->
-    <!-- NOTE: some dynamic evaluation. -->
-    <axsl:for-each select="dyn:evaluate(${../@name})/{../@name}/{@name}">
-      <axsl:copy>
-        <axsl:apply-templates select="@*"/>
-        <xsl:if test="@type='multiple-choice-list-value'">
-          <axsl:if test="$values-{@name}[string() = current()/@{attribute/@name}]">
-            <axsl:attribute name="{@expr-name}">true</axsl:attribute>
-          </axsl:if>
-        </xsl:if>
-        <!-- Include child nodes, if provided. -->
-        <axsl:copy-of select="node()"/>
-      </axsl:copy>
-    </axsl:for-each>
+    <xsl:choose>
+      <xsl:when test="../@source='dynamic'">
+        <axsl:for-each select="dyn:evaluate(${../@name})/{../@name}/{@name}">
+          <xsl:call-template name="inside-enumeration-element"/>
+        </axsl:for-each>
+      </xsl:when>
+      <xsl:otherwise>
+        <axsl:for-each select="${../@name}/{../@name}/{@name}">
+          <xsl:call-template name="inside-enumeration-element"/>
+        </axsl:for-each>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="inside-enumeration-element">
+    <axsl:copy>
+      <axsl:apply-templates select="@*"/>
+      <xsl:if test="@type='multiple-choice-list-value'">
+        <axsl:if test="$values-{@name}[string() = current()/@{attribute/@name}]">
+          <axsl:attribute name="{@expr-name}">true</axsl:attribute>
+        </axsl:if>
+      </xsl:if>
+      <!-- Include child nodes, if provided. -->
+      <axsl:copy-of select="node()"/>
+    </axsl:copy>
   </xsl:template>
 
 </xsl:stylesheet>
diff -r 8b7ede8ec9e4 -r b1e5451b3ad8 XSLForms/XSL/PrepareMacro.xsl
--- a/XSLForms/XSL/PrepareMacro.xsl	Sat Jun 21 01:38:50 2008 +0200
+++ b/XSLForms/XSL/PrepareMacro.xsl	Sun Dec 11 21:45:19 2005 +0000
@@ -127,13 +127,15 @@
   </xsl:template>
 
   <!-- Multiple choice fields, represented by menus and listboxes. -->
-  <!-- Format: element,attribute[,attribute-type] -->
+  <!-- Format: element,attribute[,attribute-type|,attribute-type,source-type] -->
 
   <xsl:template match="*[@template:multiple-choice-field]">
     <xsl:variable name="field-element" select="substring-before(@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:variable name="field-attr-type-info" select="substring-after($field-attr-info, ',')"/>
+    <xsl:variable name="field-attr-type" select="substring-before($field-attr-type-info, ',')"/>
+    <xsl:variable name="field-source-type" select="substring-after($field-attr-type-info, ',')"/>
     <xsl:copy>
       <!-- Remove multiple-choice-field and replace name. -->
       <xsl:apply-templates select="@*[local-name() != 'multiple-choice-field' and local-name() != 'name']"/>
@@ -141,7 +143,7 @@
         <xsl:attribute name="template:element"><xsl:value-of select="$field-element"/></xsl:attribute>
       </xsl:if>
       <xsl:choose>
-        <xsl:when test="$field-attr-type = 'new'">
+        <xsl:when test="$field-attr-type = 'new' or field-attr-type = '' and $field-attr-type-info = 'new'">
           <xsl:attribute name="name">{template:new-attribute('<xsl:value-of select="$field-attr"/>')}</xsl:attribute>
         </xsl:when>
         <xsl:when test="$field-attr = ''">
@@ -158,21 +160,31 @@
   </xsl:template>
 
   <!-- Multiple choice list fields, represented by menus and listboxes with multiple values. -->
-  <!-- Format: element,list-element,list-attribute -->
+  <!-- Format: element,list-element,list-attribute[,source-type] -->
 
   <xsl:template match="*[@template:multiple-choice-list-field]">
     <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-list-field, ',')"/>
     <xsl:variable name="field-list-info" select="substring-after(@template:multiple-choice-list-field, ',')"/>
     <xsl:variable name="field-list-element" select="substring-before($field-list-info, ',')"/>
-    <xsl:variable name="field-list-attr" select="substring-after($field-list-info, ',')"/>
+    <xsl:variable name="field-list-attr-info" select="substring-after($field-list-info, ',')"/>
+    <xsl:variable name="field-list-attr" select="substring-before($field-list-attr-info, ',')"/>
+    <xsl:variable name="field-source-type" select="substring-after($field-list-attr-info, ',')"/>
     <xsl:copy>
       <!-- Remove multiple-choice-list-field and replace name. -->
       <xsl:apply-templates select="@*[local-name() != 'multiple-choice-list-field' and local-name() != 'name']"/>
       <xsl:if test="$field-element != '-'">
         <xsl:attribute name="template:element"><xsl:value-of select="$field-element"/></xsl:attribute>
       </xsl:if>
-      <xsl:attribute name="name">{template:list-attribute('<xsl:value-of select="$field-list-element"/>',
-        '<xsl:value-of select="$field-list-attr"/>')}</xsl:attribute>
+      <xsl:choose>
+        <xsl:when test="$field-list-attr != ''">
+          <xsl:attribute name="name">{template:list-attribute('<xsl:value-of select="$field-list-element"/>',
+            '<xsl:value-of select="$field-list-attr"/>')}</xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="name">{template:list-attribute('<xsl:value-of select="$field-list-element"/>',
+            '<xsl:value-of select="$field-list-attr-info"/>')}</xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:apply-templates select="*|node()"/>
     </xsl:copy>
   </xsl:template>
diff -r 8b7ede8ec9e4 -r b1e5451b3ad8 XSLForms/XSL/Schema.xsl
--- a/XSLForms/XSL/Schema.xsl	Sat Jun 21 01:38:50 2008 +0200
+++ b/XSLForms/XSL/Schema.xsl	Sun Dec 11 21:45:19 2005 +0000
@@ -155,11 +155,16 @@
         <xsl:variable name="field-element" select="substring-before(@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:variable name="field-attr-type-info" select="substring-after($field-attr-info, ',')"/>
+        <xsl:variable name="field-attr-type" select="substring-before($field-attr-type-info, ',')"/>
+        <xsl:variable name="field-source-type" select="substring-after($field-attr-type-info, ',')"/>
         <xsl:choose>
           <xsl:when test="$field-element != '-'">
             <element type="multiple-choice">
               <xsl:attribute name="name"><xsl:value-of select="$field-element"/></xsl:attribute>
+              <xsl:if test="$field-source-type = 'dynamic'">
+                <xsl:attribute name="source">dynamic</xsl:attribute>
+              </xsl:if>
               <attribute>
                 <xsl:choose>
                   <xsl:when test="$field-attr != ''">
@@ -175,6 +180,9 @@
           </xsl:when>
           <xsl:otherwise>
             <xsl:attribute name="type">multiple-choice</xsl:attribute>
+            <xsl:if test="$field-source-type = 'dynamic'">
+              <xsl:attribute name="source">dynamic</xsl:attribute>
+            </xsl:if>
             <attribute>
               <xsl:choose>
                 <xsl:when test="$field-attr != ''">
@@ -193,11 +201,16 @@
         <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-list-field, ',')"/>
         <xsl:variable name="field-list-info" select="substring-after(@template:multiple-choice-list-field, ',')"/>
         <xsl:variable name="field-list-element" select="substring-before($field-list-info, ',')"/>
-        <xsl:variable name="field-list-attr" select="substring-after($field-list-info, ',')"/>
+        <xsl:variable name="field-list-attr-info" select="substring-after($field-list-info, ',')"/>
+        <xsl:variable name="field-list-attr" select="substring-before($field-list-attr-info, ',')"/>
+        <xsl:variable name="field-source-type" select="substring-after($field-list-attr-info, ',')"/>
         <xsl:choose>
           <xsl:when test="$field-element != '-'">
             <element type="multiple-choice-list">
               <xsl:attribute name="name"><xsl:value-of select="$field-element"/></xsl:attribute>
+              <xsl:if test="$field-source-type = 'dynamic'">
+                <xsl:attribute name="source">dynamic</xsl:attribute>
+              </xsl:if>
               <attribute>
                 <xsl:attribute name="name"><xsl:value-of select="$field-list-attr"/></xsl:attribute>
               </attribute>
@@ -206,6 +219,9 @@
           </xsl:when>
           <xsl:otherwise>
             <xsl:attribute name="type">multiple-choice-list</xsl:attribute>
+            <xsl:if test="$field-source-type = 'dynamic'">
+              <xsl:attribute name="source">dynamic</xsl:attribute>
+            </xsl:if>
             <attribute>
               <xsl:attribute name="name"><xsl:value-of select="$field-list-attr"/></xsl:attribute>
             </attribute>
@@ -244,10 +260,19 @@
           <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-value, ',')"/>
           <xsl:variable name="field-attr-info" select="substring-after(@template:multiple-choice-value, ',')"/>
           <xsl:variable name="field-attr" select="substring-before($field-attr-info, ',')"/>
-          <xsl:variable name="field-set-attr" select="substring-after($field-attr-info, ',')"/>
+          <xsl:variable name="field-set-attr-info" select="substring-after($field-attr-info, ',')"/>
+          <xsl:variable name="field-set-attr" select="substring-before($field-set-attr-info, ',')"/>
+          <xsl:variable name="field-contents" select="substring-after($field-set-attr-info, ',')"/>
           <xsl:attribute name="name"><xsl:value-of select="$field-element"/></xsl:attribute>
           <xsl:attribute name="expr">@<xsl:value-of select="$field-attr"/> = ../@<xsl:value-of select="$field-attr"/></xsl:attribute>
-          <xsl:attribute name="expr-attr"><xsl:value-of select="$field-set-attr"/></xsl:attribute>
+          <xsl:choose>
+            <xsl:when test="$field-set-attr != ''">
+              <xsl:attribute name="expr-attr"><xsl:value-of select="$field-set-attr"/></xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:attribute name="expr-attr"><xsl:value-of select="$field-set-attr-info"/></xsl:attribute>
+            </xsl:otherwise>
+          </xsl:choose>
           <attribute>
             <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
           </attribute>
@@ -258,12 +283,21 @@
           <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-list-value, ',')"/>
           <xsl:variable name="field-attr-info" select="substring-after(@template:multiple-choice-list-value, ',')"/>
           <xsl:variable name="field-attr" select="substring-before($field-attr-info, ',')"/>
-          <xsl:variable name="field-set-attr" select="substring-after($field-attr-info, ',')"/>
+          <xsl:variable name="field-set-attr-info" select="substring-after($field-attr-info, ',')"/>
+          <xsl:variable name="field-set-attr" select="substring-before($field-set-attr-info, ',')"/>
+          <xsl:variable name="field-contents" select="substring-after($field-set-attr-info, ',')"/>
           <xsl:attribute name="name"><xsl:value-of select="$field-element"/></xsl:attribute>
           <xsl:attribute name="expr">@value-is-set</xsl:attribute>
           <!-- Special attribute corresponding with the expression. -->
           <xsl:attribute name="expr-name">value-is-set</xsl:attribute>
-          <xsl:attribute name="expr-attr"><xsl:value-of select="$field-set-attr"/></xsl:attribute>
+          <xsl:choose>
+            <xsl:when test="$field-set-attr != ''">
+              <xsl:attribute name="expr-attr"><xsl:value-of select="$field-set-attr"/></xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:attribute name="expr-attr"><xsl:value-of select="$field-set-attr-info"/></xsl:attribute>
+            </xsl:otherwise>
+          </xsl:choose>
           <attribute>
             <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
           </attribute>