[Formed-commits] r442 - in trunk: . formed/formed/plugins/export

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-03-08 15:00:30 +0100 (Tue, 08 Mar 2011)
New Revision: 442

Modified:
   trunk/ChangeLog
   trunk/formed/formed/plugins/export/xsd.py
Log:
Updated XSD

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-02-23 14:51:39 UTC (rev 441)
+++ trunk/ChangeLog	2011-03-08 14:00:30 UTC (rev 442)
@@ -1,3 +1,7 @@
+2011-03-08  Roland Geider  <roland.geider at intevation.de>
+
+	* formed/formed/plugins/export/xsd.py: Updated XSD
+
 2011-02-23  Bernhard Herzog  <bh at intevation.de>
 
 	Port new RepeatNode attributes "orderby" and "reverse" from libformed

Modified: trunk/formed/formed/plugins/export/xsd.py
===================================================================
--- trunk/formed/formed/plugins/export/xsd.py	2011-02-23 14:51:39 UTC (rev 441)
+++ trunk/formed/formed/plugins/export/xsd.py	2011-03-08 14:00:30 UTC (rev 442)
@@ -37,6 +37,7 @@
             <xs:element ref="page"    minOccurs="0" maxOccurs="unbounded"/>
             <xs:element ref="logbook" minOccurs="0" maxOccurs="1"/>
         </xs:choice>
+        <xs:attribute name="version"       type="xs:string"/>
     </xs:complexType>
 </xs:element>
 
@@ -193,6 +194,7 @@
         <xs:attribute name="target"      type="xs:string"/>
         <xs:attribute name="modes"       type="xs:string"/>
         <xs:attribute name="formularname" type="xs:string"/>
+        <xs:attribute name="maxlength"   type="xs:string"/>
     </xs:complexType>
 </xs:element>
 
@@ -231,6 +233,8 @@
         <xs:attribute name="name"        type="xs:string"/>
         <xs:attribute name="target"      type="xs:string"/>
         <xs:attribute name="description" type="xs:string"/>
+        <xs:attribute name="containers"  type="xs:string"/>
+        <xs:attribute name="function"    type="xs:string"/>
     </xs:complexType>
 </xs:element>
 
@@ -261,13 +265,17 @@
             <xs:element ref="choice"   minOccurs="0"/>
             <xs:element ref="page"     minOccurs="0"/>
             <xs:element ref="date"     minOccurs="0"/>
-            <xs:element ref="conditional" minOccurs="0"/>
+            <xs:element ref="conditional"  minOccurs="0"/>
+            <xs:element ref="radio-matrix" minOccurs="0"/>
         </xs:choice>
         <xs:attribute name="containers"  type="xs:string"/>
         <xs:attribute name="description" type="xs:string"/>
         <xs:attribute name="min"         type="xs:string"/>
         <xs:attribute name="name"        type="xs:string"/>
         <xs:attribute name="target"      type="xs:string"/>
+        <xs:attribute name="digest"      type="xs:string"/>
+        <xs:attribute name="orderby"     type="xs:string"/>
+        <xs:attribute name="reverse"     type="xs:string"/>
     </xs:complexType>
 </xs:element>