david: doc/kolab-formats/validation kolab-storage.rng,1.1,1.2

[cvs at intevation.de]

Author: david

Update of /kolabrepository/doc/kolab-formats/validation
In directory doto:/tmp/cvs-serv8459

Modified Files:
	kolab-storage.rng 
Log Message:
Updated RelaxNG specification from Bo's mail. In particular, I made version and uid
mandatory, and used <smtp-address> (with a regexp) instead of <email>.


Index: kolab-storage.rng
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/validation/kolab-storage.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-storage.rng	15 Jun 2004 21:11:29 -0000	1.1
+++ kolab-storage.rng	16 Jun 2004 12:41:41 -0000	1.2
@@ -68,16 +68,12 @@
   </define>
   <define name="common-in-all-types">
     <interleave>
-      <optional>
-	<attribute name="version">
-	  <ref name="string"/>
-	</attribute>
-      </optional>
-      <optional>
-	<element name="uid">
-	  <ref name="string"/>
-	</element>
-      </optional>
+      <attribute name="version">
+	<ref name="string"/>
+      </attribute>
+      <element name="uid">
+	<ref name="string"/>
+      </element>
       <optional>
 	<element name="body">
 	  <ref name="string"/>
@@ -103,6 +99,11 @@
 	  </choice>
 	</element>
       </optional>
+      <zeroOrMore>
+	<element name="attachment">
+	  <ref name="string"/>
+	</element>
+      </zeroOrMore>
     </interleave>
   </define>
   <define name="common-in-tasks-and-events">
@@ -237,7 +238,7 @@
       </optional>
       <ref name="range"/>
       <zeroOrMore>
-	<element name="exception">
+	<element name="exclusion">
 	  <ref name="date"/>
 	</element>
       </zeroOrMore>
@@ -272,7 +273,20 @@
 
   <define name="recurrence-month">
     <element name="month">
-      <ref name="number"/>
+      <choice>
+	<value>january</value>
+	<value>february</value>
+	<value>march</value>
+	<value>april</value>
+	<value>may</value>
+	<value>june</value>
+	<value>july</value>
+	<value>august</value>
+	<value>september</value>
+	<value>october</value>
+	<value>november</value>
+	<value>december</value>
+      </choice>
     </element>
   </define>
 
@@ -310,8 +324,8 @@
 	  </element>
 	</optional>
 	<optional>
-	  <element name="email">
-	    <ref name="string"/>
+	  <element name="smtp-address">
+	    <ref name="smtp-address-data"/>
 	  </element>
 	</optional>
 	<optional>
@@ -634,8 +648,8 @@
 	</element>
       </optional>
       <optional>
-	<element name="email">
-	  <ref name="string"/>
+	<element name="smtp-address">
+	  <ref name="smtp-address-data"/>
 	</element>
       </optional>
     </interleave>
@@ -727,6 +741,12 @@
   <define name="color">
     <data type="string">
       <param name="pattern">#[0-9a-fA-F]{6}</param>
+    </data>
+  </define>
+  <define name="smtp-address-data">
+    <data type="string">
+      <a:documentation>Regexp a bit more permissive than RFC2822 for simplicity</a:documentation>
+      <param name="pattern">[^@]+@[^@]+\.[a-zA-Z]+</param>
     </data>
   </define>
   <define name="dateOrDateTime">