summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2011-10-28 19:01:31 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2011-10-28 19:01:31 (GMT)
commita73c4d24e5cb0137425e4bb7ea763446203d003f (patch)
tree939bf1273233f3ba8b88a80ae062873b7cc8be1d
parentfe24da9e687415550bab73e0873cc752c4d2ac7e (diff)
downloadlibkolabxml-a73c4d24e5cb0137425e4bb7ea763446203d003f.tar.gz
use multiple cycles instead of repeating the whole recurrence
-rw-r--r--schemas/incidence.xsd24
1 files changed, 16 insertions, 8 deletions
diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index bad72bf..9eb24d1 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -15,7 +15,7 @@
<xs:element name="creator" type="SMTPContact" />
<xs:element name="organizer" type="SMTPContact" />
<xs:element name="alarm" type="xs:string" />
- <xs:element name="recurrence" type="Recurrence" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="recurrence" type="Recurrence" minOccurs="0" maxOccurs="1"/>
<xs:element name="attendee" type="Attendee" />
</xs:sequence>
</xs:extension>
@@ -54,13 +54,9 @@
<xs:complexType name="Recurrence">
<xs:sequence>
- <xs:element name="yearly" type="Interval" maxOccurs="1" minOccurs="0" />
- <xs:element name="monthly" type="Interval" maxOccurs="1" minOccurs="0" />
- <xs:element name="weekly" type="Interval" maxOccurs="1" minOccurs="0" />
- <xs:element name="daily" type="Interval" maxOccurs="1" minOccurs="0" />
- <xs:element name="hourly" type="Interval" maxOccurs="1" minOccurs="0" />
- <xs:element name="minutely" type="Interval" maxOccurs="1" minOccurs="0" />
- <xs:element name="secondly" type="Interval" maxOccurs="1" minOccurs="0" />
+ <xs:element name="cycle" type="Cycle" maxOccurs="unbounded"
+ minOccurs="1">
+ </xs:element>
<xs:choice>
<xs:element name="count" type="xs:int"></xs:element>
<xs:element name="enddate" type="xs:dateTime"></xs:element>
@@ -84,4 +80,16 @@
<xs:element name="subevent" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+
+ <xs:complexType name="Cycle">
+ <xs:sequence>
+ <xs:element name="yearly" type="Interval" maxOccurs="1" minOccurs="0" />
+ <xs:element name="monthly" type="Interval" maxOccurs="1" minOccurs="0" />
+ <xs:element name="weekly" type="Interval" maxOccurs="1" minOccurs="0" />
+ <xs:element name="daily" type="Interval" maxOccurs="1" minOccurs="0" />
+ <xs:element name="hourly" type="Interval" maxOccurs="1" minOccurs="0" />
+ <xs:element name="minutely" type="Interval" maxOccurs="1" minOccurs="0" />
+ <xs:element name="secondly" type="Interval" maxOccurs="1" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
</xs:schema> \ No newline at end of file