# HG changeset patch
# User paulb
# Date 1103814473 0
# Node ID 4076e5437a9cdf8f8baf377dbda9f2bb96e01238
# Parent  caf1d0ae25e55ad3cb9bc48e0bb759da7bdedb4c
[project @ 2004-12-23 15:07:53 by paulb]
Added initial support for multivalued fields.

diff -r caf1d0ae25e5 -r 4076e5437a9c examples/Common/PEP241/Resources/pep241_categories.xsl
--- a/examples/Common/PEP241/Resources/pep241_categories.xsl	Thu Dec 23 15:07:37 2004 +0000
+++ b/examples/Common/PEP241/Resources/pep241_categories.xsl	Thu Dec 23 15:07:53 2004 +0000
@@ -5,11 +5,19 @@
 
   <xsl:param name="categories"/>
 
-  <xsl:template match="discriminator">
+  <xsl:template match="categories">
     <xsl:copy>
       <xsl:element name="category">
-        <xsl:attribute name="value"><xsl:value-of select="@category"/></xsl:attribute>
-        <xsl:copy-of select="$categories/category/category-enum"/>
+        <xsl:variable name="category-elements" select="category"/>
+        <xsl:for-each select="$categories/category/category-enum">
+          <xsl:variable name="category-enum" select="."/>
+          <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:if test="$category-elements[@value = $category-enum/@value]">
+              <xsl:attribute name="value-is-set">true</xsl:attribute>
+            </xsl:if>
+          </xsl:copy>
+        </xsl:for-each>
       </xsl:element>
     </xsl:copy>
   </xsl:template>
diff -r caf1d0ae25e5 -r 4076e5437a9c examples/Common/PEP241/Resources/pep241_error.xml
--- a/examples/Common/PEP241/Resources/pep241_error.xml	Thu Dec 23 15:07:37 2004 +0000
+++ b/examples/Common/PEP241/Resources/pep241_error.xml	Thu Dec 23 15:07:53 2004 +0000
@@ -17,34 +17,19 @@
   <dependencies>
     <dependency name="PyXML" version="0.7.1"/>
   </dependencies>
-  <discriminators>
-    <discriminator>
-      <category value="Programming Language :: Python">
-        <category-enum value="Development Status :: 1 - Planning"/>
-        <category-enum value="Development Status :: 2 - Pre-Alpha"/>
-        <category-enum value="Development Status :: 3 - Alpha"/>
-        <category-enum value="Development Status :: 4 - Beta"/>
-        <category-enum value="Development Status :: 5 - Production/Stable"/>
-        <category-enum value="Development Status :: 6 - Mature"/>
-        <category-enum value="Development Status :: 7 - Inactive"/>
-        <category-enum value="Programming Language :: Python"/>
-        <category-enum value="Topic :: Text Processing :: Markup :: XML"/>
-      </category>
-    </discriminator>
-    <discriminator>
-      <category value="Topic :: Text Processing :: Markup :: XML">
-        <category-enum value="Development Status :: 1 - Planning"/>
-        <category-enum value="Development Status :: 2 - Pre-Alpha"/>
-        <category-enum value="Development Status :: 3 - Alpha"/>
-        <category-enum value="Development Status :: 4 - Beta"/>
-        <category-enum value="Development Status :: 5 - Production/Stable"/>
-        <category-enum value="Development Status :: 6 - Mature"/>
-        <category-enum value="Development Status :: 7 - Inactive"/>
-        <category-enum value="Programming Language :: Python"/>
-        <category-enum value="Topic :: Text Processing :: Markup :: XML"/>
-      </category>
-    </discriminator>
-  </discriminators>
+  <categories>
+    <category>
+      <category-enum value="Development Status :: 1 - Planning"/>
+      <category-enum value="Development Status :: 2 - Pre-Alpha"/>
+      <category-enum value="Development Status :: 3 - Alpha"/>
+      <category-enum value="Development Status :: 4 - Beta"/>
+      <category-enum value="Development Status :: 5 - Production/Stable"/>
+      <category-enum value="Development Status :: 6 - Mature"/>
+      <category-enum value="Development Status :: 7 - Inactive"/>
+      <category-enum value="Programming Language :: Python" value-is-set="true"/>
+      <category-enum value="Topic :: Text Processing :: Markup :: XML" value-is-set="true"/>
+    </category>
+  </categories>
   <!-- Errors must appear last in an element to avoid positioning issues. -->
   <error description-size="1000"/>
 </package>
diff -r caf1d0ae25e5 -r 4076e5437a9c examples/Common/PEP241/Resources/pep241_input.xml
--- a/examples/Common/PEP241/Resources/pep241_input.xml	Thu Dec 23 15:07:37 2004 +0000
+++ b/examples/Common/PEP241/Resources/pep241_input.xml	Thu Dec 23 15:07:53 2004 +0000
@@ -15,8 +15,8 @@
   <dependencies>
     <dependency name="PyXML" version="0.7.1"/>
   </dependencies>
-  <discriminators>
-    <discriminator category="Programming Language :: Python"/>
-    <discriminator category="Topic :: Text Processing :: Markup :: XML"/>
-  </discriminators>
+  <categories>
+    <category value="Programming Language :: Python"/>
+    <category value="Topic :: Text Processing :: Markup :: XML"/>
+  </categories>
 </package>
diff -r caf1d0ae25e5 -r 4076e5437a9c examples/Common/PEP241/Resources/pep241_template.xhtml
--- a/examples/Common/PEP241/Resources/pep241_template.xhtml	Thu Dec 23 15:07:37 2004 +0000
+++ b/examples/Common/PEP241/Resources/pep241_template.xhtml	Thu Dec 23 15:07:53 2004 +0000
@@ -56,23 +56,14 @@
       <tr>
         <th colspan="2" class="heading">Discriminators</th>
       </tr>
-      <tr template:element="discriminators,discriminator">
-        <th>Discriminator</th>
+      <tr template:element="categories">
+        <th>Categories</th>
         <td>
-          <select template:element="category" name="{template:field-name()}">
-            <option template:element="category-enum" template:expr-attr="selected" template:expr="@value = ../@value" template:value="@value"
+          <select template:element="category" name="{template:field-name()}" multiple="multiple">
+            <option template:element="category-enum" template:expr-attr="selected" template:expr="@value-is-set" template:value="@value"
             value="{@value}"></option>
           </select>
-           
-          <input type="submit" value="Remove!"
-          name="remove_discriminator={template:this-position()}"
-        /></td>
-      </tr>
-      <tr>
-        <th></th>
-        <td>
-          <input type="submit" value="Add discriminator!"
-          name="add_discriminator={template:this-position()}" /></td>
+        </td>
       </tr>
       <tr>
         <th colspan="2" class="heading">Platforms</th>