[Formed-commits] r303 - in trunk/formed/formed: model plugins/export

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-01-20 16:42:35 +0100 (Tue, 20 Jan 2009)
New Revision: 303

Modified:
   trunk/formed/formed/model/data.py
   trunk/formed/formed/plugins/export/xsd.py
Log:
Support Logbook in xsd schema


Modified: trunk/formed/formed/model/data.py
===================================================================
--- trunk/formed/formed/model/data.py	2009-01-09 15:54:40 UTC (rev 302)
+++ trunk/formed/formed/model/data.py	2009-01-20 15:42:35 UTC (rev 303)
@@ -51,17 +51,6 @@
         self.visit(collector.visitor, mode, allModes)
         return collector.widgets
 
-class RepeatNode(Node):
-    def __init__(self):
-        Node.__init__(self)
-        self.attributes["min"]  = ""
-        self.attributes["max"]  = ""
-
-    def allWidgets(self, mode=None, allModes=None):
-        collector = WidgetCollector()
-        self.visit(collector.visitor, mode, allModes)
-        return collector.widgets
-
 class GroupNode(Node):
     def __init__(self):
         Node.__init__(self)
@@ -87,6 +76,24 @@
         self.visit(collector.visitor, mode, allModes)
         return collector.widgets
 
+class RepeatNode(GroupNode):
+    def __init__(self):
+        Node.__init__(self)
+        self.attributes["min"]  = ""
+        self.attributes["max"]  = ""
+
+    def isRepeat(self):
+        return True
+
+    def setRepeat(self, repeat):
+        pass
+
+    def isInvisible(self):
+        return False 
+
+    def setInvisible(self, invisible):
+        pass
+
 class MatrixNode(GroupNode):
     def __init__(self):
         GroupNode.__init__(self)

Modified: trunk/formed/formed/plugins/export/xsd.py
===================================================================
--- trunk/formed/formed/plugins/export/xsd.py	2009-01-09 15:54:40 UTC (rev 302)
+++ trunk/formed/formed/plugins/export/xsd.py	2009-01-20 15:42:35 UTC (rev 303)
@@ -29,14 +29,29 @@
 <!-- XML schema generated by FormEd 
      %s -->
 
+<xs:simpleType name="version_type">
+  <xs:restriction base="xs:string">
+    <xs:pattern value="[0-2]{1}"/>
+  </xs:restriction>
+</xs:simpleType>
+
 <xs:element name="cases">
   <xs:complexType>
     <xs:sequence>
       <xs:element ref="case" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
+    <xs:attribute name="version" type="version_type"/>
   </xs:complexType>
 </xs:element>
 
+<xs:element name="tagebuch">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element ref="tagebuch-eintrag" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:element>
+
 <xs:simpleType name="uuid_type">
   <xs:restriction base="xs:string">
     <xs:pattern value="[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"/>
@@ -44,8 +59,8 @@
 </xs:simpleType>
 
 <xs:simpleType name="simple_date_type">
-  <xs:restriction base="xs:date">
-    <xs:pattern value="[0-9]{1,4}-[0-9]{1,2}-[0-9]{1,2}"/>
+  <xs:restriction base="xs:string">
+    <xs:pattern value="[0-9]{1,4}-[0-9]{1,2}-[0-9]{1,2}|[0-9]{1,4}-[0-9]{1,2}-[0-9]{1,2}T[0-9]{2}:[0-9]{2}:[0-9]{2}"/>
   </xs:restriction>
 </xs:simpleType>
 
@@ -63,6 +78,7 @@
     <xs:sequence>
         <xs:element ref="master" minOccurs="0" maxOccurs="1"/>
         <xs:element ref="repeat_group_type" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="tagebuch" minOccurs="0" maxOccurs="1"/>
     </xs:sequence>
   </xs:complexType>
 </xs:element>