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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-09-14 09:41:39 +0200 (Tue, 14 Sep 2010)
New Revision: 397

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-09-01 13:15:22 UTC (rev 396)
+++ trunk/ChangeLog	2010-09-14 07:41:39 UTC (rev 397)
@@ -1,3 +1,8 @@
+2010-09-14 Roland Geider <roland.geider at intevation.de>
+
+	* formed/formed/plugins/export/xsd.py: issue1131: update XSD for new
+	  formedtree structure
+
 2010-09-01 Roland Geider <roland.geider at intevation.de>
 
 	* formed/formed/plugins/modify/rules.py: issue1050: mandatory fields

Modified: trunk/formed/formed/plugins/export/xsd.py
===================================================================
--- trunk/formed/formed/plugins/export/xsd.py	2010-09-01 13:15:22 UTC (rev 396)
+++ trunk/formed/formed/plugins/export/xsd.py	2010-09-14 07:41:39 UTC (rev 397)
@@ -80,6 +80,7 @@
             <xs:element ref="conditional"  minOccurs="0"/>
             <xs:element ref="radio-matrix" minOccurs="0"/>
             <xs:element ref="info"     minOccurs="0"/>
+            <xs:element ref="bool"     minOccurs="0"/>
         </xs:choice>
         <xs:attribute name="description" type="xs:string"/>
         <xs:attribute name="containers"  type="xs:string"/>
@@ -202,6 +203,8 @@
             <xs:element ref="text"        minOccurs="0"/>
             <xs:element ref="date"        minOccurs="0"/>
             <xs:element ref="rule"        minOccurs="0"/>
+            <xs:element ref="info"        minOccurs="0"/>
+            <xs:element ref="bool"        minOccurs="0"/>
             <xs:element ref="repeat"      minOccurs="0"/>
             <xs:element ref="radio-matrix" minOccurs="0"/>
         </xs:choice>
@@ -240,6 +243,7 @@
             <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:choice>
         <xs:attribute name="containers"  type="xs:string"/>
         <xs:attribute name="description" type="xs:string"/>