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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-04-28 09:30:34 +0200 (Wed, 28 Apr 2010)
New Revision: 358

Modified:
   trunk/ChangeLog
   trunk/formed/formed/plugins/export/xsd.py
Log:
WASKA formedtree.xml validates XSD

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-28 07:10:33 UTC (rev 357)
+++ trunk/ChangeLog	2010-04-28 07:30:34 UTC (rev 358)
@@ -1,6 +1,7 @@
 2010-04-28	Roland Geider <roland.geider at intevation.de>
 
 	* formed/plugins/export/xls.py: Radiogroups are exported
+        * formed/plugins/export/xsd.py: WASKA formedtree.xml validates XSD
         
 2010-04-08  Torsten Irländer <torsten.irlaender at intevation.de>
 

Modified: trunk/formed/formed/plugins/export/xsd.py
===================================================================
--- trunk/formed/formed/plugins/export/xsd.py	2010-04-28 07:10:33 UTC (rev 357)
+++ trunk/formed/formed/plugins/export/xsd.py	2010-04-28 07:30:34 UTC (rev 358)
@@ -31,10 +31,12 @@
 
 <xs:element name="document">
     <xs:complexType>
-        <xs:sequence>
+        <xs:choice maxOccurs="unbounded">
             <xs:element ref="case"    minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="group"   minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="page"    minOccurs="0" maxOccurs="unbounded"/>
             <xs:element ref="logbook" minOccurs="0" maxOccurs="1"/>
-        </xs:sequence>
+        </xs:choice>
     </xs:complexType>
 </xs:element>
 
@@ -53,6 +55,8 @@
         <xs:attribute name="name"        type="xs:string"/>
         <xs:attribute name="containers"  type="xs:string"/>
         <xs:attribute name="function"    type="xs:string"/>
+        <xs:attribute name="modes"       type="xs:string"/>
+        <xs:attribute name="formularname" type="xs:string"/>
     </xs:complexType>
 </xs:element>
 
@@ -75,12 +79,14 @@
             <xs:element ref="int"      minOccurs="0"/>
             <xs:element ref="conditional"  minOccurs="0"/>
             <xs:element ref="radio-matrix" minOccurs="0"/>
+            <xs:element ref="info"     minOccurs="0"/>
         </xs:choice>
         <xs:attribute name="description" type="xs:string"/>
         <xs:attribute name="containers"  type="xs:string"/>
         <xs:attribute name="invisible"   type="xs:string"/>
         <xs:attribute name="name"        type="xs:string"/>
         <xs:attribute name="target"      type="xs:string"/>
+        <xs:attribute name="formularname" type="xs:string"/>
     </xs:complexType>
 </xs:element>
 
@@ -108,6 +114,9 @@
         <xs:attribute name="containers"  type="xs:string"/>
         <xs:attribute name="target"      type="xs:string"/>
         <xs:attribute name="flags"       type="xs:string"/>
+        <xs:attribute name="modes"       type="xs:string"/>
+        <xs:attribute name="repeat"      type="xs:string"/>
+        <xs:attribute name="formularname" type="xs:string"/>
     </xs:complexType>
 </xs:element>
 
@@ -133,14 +142,17 @@
         <xs:attribute name="maxvalue"    type="xs:string"/>
         <xs:attribute name="flags"       type="xs:string"/>
         <xs:attribute name="alternative" type="xs:string"/>
+        <xs:attribute name="modes"       type="xs:string"/>
+        <xs:attribute name="formularname" type="xs:string"/>
     </xs:complexType>
 </xs:element>
 
 <xs:element name="info">
     <xs:complexType>
-        <xs:attribute name="name"     type="xs:string"/>
-        <xs:attribute name="target"   type="xs:string"/>
-        <xs:attribute name="value"    type="xs:string"/>
+        <xs:attribute name="name"        type="xs:string"/>
+        <xs:attribute name="target"      type="xs:string"/>
+        <xs:attribute name="value"       type="xs:string"/>
+        <xs:attribute name="description" type="xs:string"/>
     </xs:complexType>
 </xs:element>
 
@@ -159,7 +171,10 @@
         <xs:attribute name="description" type="xs:string"/>
         <xs:attribute name="name"        type="xs:string"/>
         <xs:attribute name="rows"        type="xs:string"/>
+        <xs:attribute name="cols"        type="xs:string"/>
         <xs:attribute name="target"      type="xs:string"/>
+        <xs:attribute name="modes"       type="xs:string"/>
+        <xs:attribute name="formularname" type="xs:string"/>
     </xs:complexType>
 </xs:element>
 
@@ -207,6 +222,8 @@
         <xs:attribute name="size"         type="xs:string"/>
         <xs:attribute name="target"       type="xs:string"/>
         <xs:attribute name="flags"        type="xs:string"/>
+        <xs:attribute name="selected"    type="xs:string"/>
+        <xs:attribute name="modes"       type="xs:string"/>
     </xs:complexType>
 </xs:element>
 
@@ -237,6 +254,8 @@
         <xs:attribute name="name"        type="xs:string"/>
         <xs:attribute name="order"       type="xs:string"/>
         <xs:attribute name="target"      type="xs:string"/>
+        <xs:attribute name="modes"       type="xs:string"/>
+        <xs:attribute name="formularname" type="xs:string"/>
     </xs:complexType>
 </xs:element>