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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-04-28 10:07:00 +0200 (Wed, 28 Apr 2010)
New Revision: 359

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-28 07:30:34 UTC (rev 358)
+++ trunk/ChangeLog	2010-04-28 08:07:00 UTC (rev 359)
@@ -2,6 +2,7 @@
 
 	* formed/plugins/export/xls.py: Radiogroups are exported
         * formed/plugins/export/xsd.py: WASKA formedtree.xml validates XSD
+        JMD 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:30:34 UTC (rev 358)
+++ trunk/formed/formed/plugins/export/xsd.py	2010-04-28 08:07:00 UTC (rev 359)
@@ -202,11 +202,14 @@
             <xs:element ref="text"        minOccurs="0"/>
             <xs:element ref="date"        minOccurs="0"/>
             <xs:element ref="rule"        minOccurs="0"/>
+            <xs:element ref="repeat"      minOccurs="0"/>
+            <xs:element ref="radio-matrix" minOccurs="0"/>
         </xs:choice>
-        <xs:attribute name="expr"      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="expr"        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="description" type="xs:string"/>
     </xs:complexType>
 </xs:element>
 
@@ -236,6 +239,7 @@
             <xs:element ref="int"      minOccurs="0"/>
             <xs:element ref="choice"   minOccurs="0"/>
             <xs:element ref="page"     minOccurs="0"/>
+            <xs:element ref="date"     minOccurs="0"/>
         </xs:choice>
         <xs:attribute name="containers"  type="xs:string"/>
         <xs:attribute name="description" type="xs:string"/>
@@ -268,7 +272,7 @@
 <xs:element name="cases">
   <xs:complexType>
     <xs:sequence>
-      <xs:element ref="case" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="case" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
     <xs:attribute name="version" type="version_type"/>
   </xs:complexType>
@@ -331,6 +335,7 @@
         <xs:element ref="repeat_group_type" minOccurs="0"/>
         <xs:element ref="tagebuch"          minOccurs="0"/>
         <xs:element ref="page"              minOccurs="0"/>
+        <xs:element ref="repeat"            minOccurs="0"/>
     </xs:choice>
   </xs:complexType>
 </xs:element>