# HG changeset patch
# User paulb
# Date 1121962519 0
# Node ID 73afbdf76255b456e61f74148f488cb90aee9a0d
# Parent  50fc02861d65e17a64741d4b639750033e14a305
[project @ 2005-07-21 16:15:19 by paulb]
Changed the usage of list-attribute, replaced multivalued fields with
single-valued fields, and changed the database transformation to use more
obvious methods.

diff -r 50fc02861d65 -r 73afbdf76255 examples/Common/Configurator/Resources/config_database.xsl
--- a/examples/Common/Configurator/Resources/config_database.xsl	Thu Jul 21 16:14:08 2005 +0000
+++ b/examples/Common/Configurator/Resources/config_database.xsl	Thu Jul 21 16:15:19 2005 +0000
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:template="http://www.boddie.org.uk/ns/xmltools/template"
-                xmlns:dyn="http://exslt.org/dynamic"
-                extension-element-prefixes="dyn"
                 version="1.0">
 
   <xsl:param name="database"/>
@@ -10,123 +7,125 @@
   <xsl:template match="configuration">
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
+      <!-- Find out some additional information. -->
+      <xsl:variable name="cpu-socket" select="$database/database/base-system/base-system-enum[@value = current()/details/base-system/@value]/@cpu-socket"/>
+      <xsl:variable name="interface" select="$database/database/base-system/base-system-enum[@value = current()/details/base-system/@value]/@interface"/>
       <!-- Complete all multiple choice fields. -->
       <details>
-        <xsl:call-template name="complete-element">
-          <xsl:with-param name="found-element" select="details/base-system[1]"/>
-          <xsl:with-param name="element-name">base-system</xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="complete-element">
-          <xsl:with-param name="found-element" select="details/cpu[1]"/>
-          <xsl:with-param name="control-element" select="details/base-system[1]"/>
-          <xsl:with-param name="element-name">cpu</xsl:with-param>
-          <xsl:with-param name="control-element-name">base-system</xsl:with-param>
-          <xsl:with-param name="control-attribute-name">cpu-socket</xsl:with-param>
-        </xsl:call-template>
+        <base-system>
+          <xsl:variable name="value" select="details/base-system/@value"/>
+          <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
+          <xsl:for-each select="$database/database/base-system/base-system-enum">
+            <xsl:copy>
+              <xsl:apply-templates select="@*"/>
+              <xsl:if test="@value = $value">
+                <xsl:attribute name="value-is-set">true</xsl:attribute>
+              </xsl:if>
+            </xsl:copy>
+          </xsl:for-each>
+        </base-system>
+        <cpu>
+          <xsl:variable name="value" select="details/cpu/@value"/>
+          <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
+          <xsl:for-each select="$database/database/cpu/cpu-enum[@cpu-socket = $cpu-socket or not(@cpu-socket)]">
+            <xsl:copy>
+              <xsl:apply-templates select="@*"/>
+              <xsl:if test="@value = $value">
+                <xsl:attribute name="value-is-set">true</xsl:attribute>
+              </xsl:if>
+            </xsl:copy>
+          </xsl:for-each>
+        </cpu>
       </details>
       <memory>
         <xsl:for-each select="memory/memory-unit">
-          <xsl:call-template name="complete-element">
-            <xsl:with-param name="found-element" select="."/>
-            <xsl:with-param name="element-name">memory-unit</xsl:with-param>
-          </xsl:call-template>
+          <xsl:copy>
+            <xsl:variable name="value" select="@value"/>
+            <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
+            <xsl:for-each select="$database/database/memory-unit/memory-unit-enum">
+              <xsl:copy>
+                <xsl:apply-templates select="@*"/>
+                <xsl:if test="@value = $value">
+                  <xsl:attribute name="value-is-set">true</xsl:attribute>
+                </xsl:if>
+              </xsl:copy>
+            </xsl:for-each>
+          </xsl:copy>
         </xsl:for-each>
       </memory>
       <hard-disks>
         <xsl:for-each select="hard-disks/hard-disk">
-          <xsl:call-template name="complete-element">
-            <xsl:with-param name="found-element" select="."/>
-            <xsl:with-param name="control-element" select="/configuration/details/base-system[1]"/>
-            <xsl:with-param name="element-name">hard-disk</xsl:with-param>
-            <xsl:with-param name="control-element-name">base-system</xsl:with-param>
-            <xsl:with-param name="control-attribute-name">interface</xsl:with-param>
-          </xsl:call-template>
+          <xsl:copy>
+            <xsl:variable name="value" select="@value"/>
+            <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
+            <xsl:for-each select="$database/database/hard-disk/hard-disk-enum[@interface = $interface or not(@interface)]">
+              <xsl:copy>
+                <xsl:apply-templates select="@*"/>
+                <xsl:if test="@value = $value">
+                  <xsl:attribute name="value-is-set">true</xsl:attribute>
+                </xsl:if>
+              </xsl:copy>
+            </xsl:for-each>
+          </xsl:copy>
         </xsl:for-each>
       </hard-disks>
       <storage>
         <xsl:for-each select="storage/storage-unit">
-          <xsl:call-template name="complete-element">
-            <xsl:with-param name="found-element" select="."/>
-            <xsl:with-param name="element-name">storage-unit</xsl:with-param>
-          </xsl:call-template>
+          <xsl:copy>
+            <xsl:variable name="value" select="@value"/>
+            <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
+            <xsl:for-each select="$database/database/storage-unit/storage-unit-enum">
+              <xsl:copy>
+                <xsl:apply-templates select="@*"/>
+                <xsl:if test="@value = $value">
+                  <xsl:attribute name="value-is-set">true</xsl:attribute>
+                </xsl:if>
+              </xsl:copy>
+            </xsl:for-each>
+          </xsl:copy>
         </xsl:for-each>
       </storage>
       <peripherals>
-        <xsl:call-template name="complete-element">
-          <xsl:with-param name="found-element" select="peripherals/keyboard[1]"/>
-          <xsl:with-param name="element-name">keyboard</xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="complete-element">
-          <xsl:with-param name="found-element" select="peripherals/mouse[1]"/>
-          <xsl:with-param name="element-name">mouse</xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="complete-element">
-          <xsl:with-param name="found-element" select="peripherals/screen[1]"/>
-          <xsl:with-param name="element-name">screen</xsl:with-param>
-        </xsl:call-template>
+        <keyboard>
+          <xsl:variable name="value" select="peripherals/keyboard/@value"/>
+          <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
+          <xsl:for-each select="$database/database/keyboard/keyboard-enum">
+            <xsl:copy>
+              <xsl:apply-templates select="@*"/>
+              <xsl:if test="@value = $value">
+                <xsl:attribute name="value-is-set">true</xsl:attribute>
+              </xsl:if>
+            </xsl:copy>
+          </xsl:for-each>
+        </keyboard>
+        <mouse>
+          <xsl:variable name="value" select="peripherals/mouse/@value"/>
+          <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
+          <xsl:for-each select="$database/database/mouse/mouse-enum">
+            <xsl:copy>
+              <xsl:apply-templates select="@*"/>
+              <xsl:if test="@value = $value">
+                <xsl:attribute name="value-is-set">true</xsl:attribute>
+              </xsl:if>
+            </xsl:copy>
+          </xsl:for-each>
+        </mouse>
+        <screen>
+          <xsl:variable name="value" select="peripherals/screen/@value"/>
+          <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
+          <xsl:for-each select="$database/database/screen/screen-enum">
+            <xsl:copy>
+              <xsl:apply-templates select="@*"/>
+              <xsl:if test="@value = $value">
+                <xsl:attribute name="value-is-set">true</xsl:attribute>
+              </xsl:if>
+            </xsl:copy>
+          </xsl:for-each>
+        </screen>
       </peripherals>
     </xsl:copy>
   </xsl:template>
 
-  <xsl:template name="complete-element">
-    <!-- Input parameters. -->
-    <xsl:param name="found-element"/>
-    <xsl:param name="control-element"/>
-    <!-- Database parameters. -->
-    <xsl:param name="element-name"/>
-    <xsl:param name="control-element-name"/>
-    <xsl:param name="control-attribute-name"/>
-    <!-- Find the database entries. -->
-    <xsl:variable name="element-enum-name"><xsl:value-of select="$element-name"/>-enum</xsl:variable>
-    <xsl:variable name="control-element-enum-name"><xsl:value-of select="$control-element-name"/>-enum</xsl:variable>
-    <!-- Find whether the input values are set. -->
-    <xsl:variable name="has-set-values" select="$found-element[@value]"/>
-    <xsl:variable name="has-control-values" select="$control-element and $control-element[@value]"/>
-    <!-- Get the database element for the element being prepared. -->
-    <xsl:variable name="database-element" select="$database/database/*[local-name() = $element-name]"/>
-    <!-- Get the database element for the control element. -->
-    <xsl:variable name="database-control-element" select="$database/database/*[local-name() = $control-element-name]"/>
-    <!-- Get the database entries for the control element. -->
-    <xsl:variable name="control-enum-elements" select="$database-control-element/*[local-name() = $control-element-enum-name]"/>
-    <!-- Get the database entry for the control element, then get the control attribute value in that entry. -->
-    <xsl:variable name="other-control-value" select="$control-enum-elements[@value = $control-element/@value]/@*[local-name() = $control-attribute-name]"/>
-    <!-- Make the element with the different values. -->
-    <xsl:element name="{$element-name}">
-      <!-- Find the entries in the database for the element being prepared. -->
-      <xsl:for-each select="$database-element/*[local-name() = $element-enum-name]">
-        <!-- Remember the current node for future comparisons. -->
-        <xsl:variable name="enum-element" select="."/>
-        <!-- Find whether the current entry matches the input value. -->
-        <xsl:variable name="matching-element" select="$found-element[@value = $enum-element/@value]"/>
-        <!-- Get the control attribute value for the current entry. -->
-        <xsl:variable name="this-control-value" select="@*[local-name() = $control-attribute-name]"/>
-        <!-- Filter the entry out unless no control element was given, this entry has no control attribute value or...
-             if the control attribute value matches the one for the control element. -->
-        <xsl:if test="not($has-control-values) or not($this-control-value) or $this-control-value = $other-control-value">
-          <!-- Copy the entry. -->
-          <xsl:copy>
-            <!-- Include all attributes except the price, adding the price only if the item is selected. -->
-            <xsl:apply-templates select="@*[local-name() != 'price']"/>
-            <!-- Find whether this item is selected. -->
-            <xsl:choose>
-              <!-- In the current field, the value attribute matches this value. -->
-              <xsl:when test="$matching-element">
-                <xsl:attribute name="value-is-set">true</xsl:attribute>
-                <xsl:apply-templates select="@price"/>
-              </xsl:when>
-              <!-- This value is the first and no value attribute is specified. -->
-              <xsl:when test="not($has-set-values) and count($enum-element/preceding-sibling::*) = 0">
-                <xsl:attribute name="value-is-set">true</xsl:attribute>
-                <xsl:apply-templates select="@price"/>
-              </xsl:when>
-              <xsl:otherwise/>
-            </xsl:choose>
-          </xsl:copy>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:element>
-  </xsl:template>
-
   <!-- Replicate unknown elements. -->
 
   <xsl:template match="@*|node()">
diff -r 50fc02861d65 -r 73afbdf76255 examples/Common/Configurator/Resources/config_template.xhtml
--- a/examples/Common/Configurator/Resources/config_template.xhtml	Thu Jul 21 16:14:08 2005 +0000
+++ b/examples/Common/Configurator/Resources/config_template.xhtml	Thu Jul 21 16:15:19 2005 +0000
@@ -17,118 +17,123 @@
 <form method="post" action="" template:element="configuration">
 <div id="left">
   <div template:element="details" class="details">
-  <h2>Base System</h2>
+    <h2>Base System</h2>
 
-  <p template:element="base-system">Model 
-  <select name="{template:list-attribute('value')}" onchange="requestUpdate('{$application-url}cpu', '{template:list-attribute('value')}', '{template:other-nodes(../cpu)}', '{template:other-list-attributes('value', ../cpu)}', '/configuration/details/cpu'); requestUpdate('{$application-url}memory', '{template:list-attribute('value')}', '{template:other-nodes(../../memory)}', '{template:other-list-attributes('value', ../../memory/memory-unit)}', '/configuration/memory'); requestUpdate('{$application-url}hard-disks', '{template:list-attribute('value')}', '{template:other-nodes(../../hard-disks)}', '{template:other-list-attributes('value', ../../hard-disks/hard-disk)}', '/configuration/hard-disks')">
-    <option template:element="base-system-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-    value="{@value}"></option>
-  </select>
-  </p>
+    <p template:element="base-system">Model 
+      <select template:attribute="value" name="{template:this-attribute()}" onchange="requestUpdate('{$application-url}cpu', '{template:this-attribute()}', '{template:other-elements(../cpu)}', '{template:other-attributes('value', ../cpu)}', '/configuration/details/cpu'); requestUpdate('{$application-url}memory', '{template:this-attribute()}', '{template:other-elements(../../memory)}', '{template:other-attributes('value', ../../memory/memory-unit)}', '/configuration/memory'); requestUpdate('{$application-url}hard-disks', '{template:this-attribute()}', '{template:other-elements(../../hard-disks)}', '{template:other-attributes('value', ../../hard-disks/hard-disk)}', '/configuration/hard-disks')">
+        <option template:element="base-system-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
+        value="{@value}"></option>
+      </select>
+    </p>
 
-  <h2>Processor</h2>
+    <h2>Processor</h2>
 
-  <p template:element="cpu">CPU 
-  <select template:id="cpu-node" id="{template:this-element()}" name="{template:list-attribute('value')}">
-    <option template:element="cpu-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-    value="{@value}"></option>
-  </select>
-  </p>
+    <p template:element="cpu" template:id="cpu-node" id="{template:this-element()}">CPU 
+      <select template:attribute="value" name="{template:this-attribute()}">
+        <option template:element="cpu-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
+        value="{@value}"></option>
+      </select>
+    </p>
   </div>
 
-  <div template:element="memory" class="memory">
-  <h2>Memory</h2>
+  <div class="memory" template:element="memory">
+    <h2>Memory</h2>
 
-  <div template:id="memory-node" id="{template:this-element()}">
-    <p template:element="memory-unit">Memory unit 
-    <select name="{template:list-attribute('value')}">
-      <option template:element="memory-unit-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-      value="{@value}"></option>
-    </select>
+    <div template:id="memory-node" id="{template:this-element()}">
+      <p template:element="memory-unit">Memory unit 
+        <select template:attribute="value" name="{template:this-attribute()}">
+          <option template:element="memory-unit-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
+          value="{@value}"></option>
+        </select>
    
-    <input type="submit" value="Remove"
-    name="remove-memory-unit={template:this-element()}" /></p>
+        <input type="submit" value="Remove"
+        name="remove-memory-unit={template:this-element()}" />
+      </p>
 
-    <p>
-    <input type="submit" value="Add memory"
-    name="add-memory-unit={template:this-element()}" /></p>
+      <p>
+        <input type="submit" value="Add memory"
+        name="add-memory-unit={template:this-element()}" />
+      </p>
     </div>
   </div>
 </div>
 <div id="right">
-  <div template:element="hard-disks" class="hard-disks">
-  <h2>Hard Disks</h2>
+  <div class="hard-disks" template:element="hard-disks">
+    <h2>Hard Disks</h2>
 
-  <div template:id="hard-disks-node" id="{template:this-element()}">
-    <p template:element="hard-disk">Hard disk drive 
-    <select name="{template:list-attribute('value')}">
-      <option template:element="hard-disk-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-      value="{@value}"></option>
-    </select>
+    <div template:id="hard-disks-node" id="{template:this-element()}">
+      <p template:element="hard-disk">Hard disk drive 
+        <select template:attribute="value" name="{template:this-attribute()}">
+          <option template:element="hard-disk-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
+          value="{@value}"></option>
+        </select>
    
-    <input type="submit" value="Remove"
-    name="remove-hard-disk={template:this-element()}" /></p>
+        <input type="submit" value="Remove"
+        name="remove-hard-disk={template:this-element()}" />
+      </p>
 
-    <p>
-    <input type="submit" value="Add hard disk"
-    name="add-hard-disk={template:this-element()}" /></p>
+      <p>
+        <input type="submit" value="Add hard disk"
+        name="add-hard-disk={template:this-element()}" />
+      </p>
     </div>
   </div>
 
   <div template:element="storage" class="storage">
-  <h2>Additional Storage</h2>
+    <h2>Additional Storage</h2>
 
-  <p template:element="storage-unit">Storage unit 
-  <select name="{template:list-attribute('value')}">
-    <option template:element="storage-unit-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-    value="{@value}"></option>
-  </select>
+    <p template:element="storage-unit">Storage unit 
+      <select template:attribute="value" name="{template:this-attribute()}">
+        <option template:element="storage-unit-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
+        value="{@value}"></option>
+      </select>
    
-  <input type="submit" value="Remove"
-  name="remove-storage-unit={template:this-element()}" /></p>
+      <input type="submit" value="Remove"
+      name="remove-storage-unit={template:this-element()}" />
+    </p>
 
-  <p>
-  <input type="submit" value="Add storage"
-  name="add-storage-unit={template:this-element()}" /></p>
+    <p>
+      <input type="submit" value="Add storage"
+      name="add-storage-unit={template:this-element()}" /></p>
   </div>
 </div>
 <div id="bottom">
   <div template:element="peripherals" class="peripherals">
-  <h2>Input Devices</h2>
+    <h2>Input Devices</h2>
 
-  <p template:element="keyboard">Keyboard 
-  <select name="{template:list-attribute('value')}">
-    <option template:element="keyboard-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-    value="{@value}"></option>
-  </select>
-  </p>
+    <p template:element="keyboard">Keyboard 
+      <select template:attribute="value" name="{template:this-attribute()}">
+        <option template:element="keyboard-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
+        value="{@value}"></option>
+      </select>
+    </p>
 
-  <p template:element="mouse">Mouse 
-  <select name="{template:list-attribute('value')}">
-    <option template:element="mouse-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-    value="{@value}"></option>
-  </select>
-  </p>
+    <p template:element="mouse">Mouse 
+      <select template:attribute="value" name="{template:this-attribute()}">
+        <option template:element="mouse-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
+        value="{@value}"></option>
+      </select>
+    </p>
 
-  <h2>Display</h2>
+    <h2>Display</h2>
 
-  <p template:element="screen">Screen 
-  <select name="{template:list-attribute('value')}">
-    <option template:element="screen-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-    value="{@value}"></option>
-  </select>
-  </p>
+    <p template:element="screen">Screen 
+      <select template:attribute="value" name="{template:this-attribute()}">
+        <option template:element="screen-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
+        value="{@value}"></option>
+      </select>
+    </p>
   </div>
 
   <div class="price">
-  <h2>Price</h2>
+    <h2>Price</h2>
 
-  <p>Total for this configuration:
-  <span template:value="sum(/configuration//*/@price)"></span></p>
+    <p>Total for this configuration:
+      <span template:value="sum(/configuration//*[@value-is-set]/@price)"></span></p>
 
-  <p>
-  <input type="submit" value="Update!" name="update" />
-  <input type="submit" value="Export!" name="export" /></p>
+    <p>
+      <input type="submit" value="Update!" name="update" />
+      <input type="submit" value="Export!" name="export" /></p>
   </div>
 </div>
 </form>