Skip to content

Commit 82d9a25

Browse files
authored
Merge pull request #31 from mlocati/restore-chooseCalendar
Restore chooseCalendar
2 parents b41e32b + 057b077 commit 82d9a25

File tree

3 files changed

+14
-128
lines changed

3 files changed

+14
-128
lines changed

src/main/resources/concrete-cif-1.0.xsd

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,6 +2744,7 @@
27442744
<xs:complexType>
27452745
<xs:all>
27462746
<xs:element name="caID" type="xs:integer" minOccurs="0" maxOccurs="1" />
2747+
<xs:element name="chooseCalendar" type="chooseCalendarEnum" minOccurs="0" maxOccurs="1" />
27472748
<xs:element name="calendarAttributeKeyHandle" type="handle" minOccurs="0" maxOccurs="1" />
27482749
<xs:element name="filterByTopicAttributeKeyID" type="xs:integer" minOccurs="0" maxOccurs="1" />
27492750
<xs:element name="filterByTopicID" type="xs:integer" minOccurs="0" maxOccurs="1" />
@@ -3298,6 +3299,7 @@
32983299
<xs:complexType>
32993300
<xs:all>
33003301
<xs:element name="caID" type="xs:string" minOccurs="0" maxOccurs="1" />
3302+
<xs:element name="chooseCalendar" type="chooseCalendarEnum" minOccurs="0" maxOccurs="1" />
33013303
<xs:element name="calendarAttributeKeyHandle" type="handle" minOccurs="0" maxOccurs="1" />
33023304
<xs:element name="totalToRetrieve" type="integer-greather-than-zero" minOccurs="0" maxOccurs="1" />
33033305
<xs:element name="totalPerPage" type="integer-greather-than-zero" minOccurs="0" maxOccurs="1" />
@@ -4926,4 +4928,16 @@
49264928
<xs:restriction base="xs:string" />
49274929
</xs:simpleType>
49284930

4931+
<!--
4932+
### Calendar-related
4933+
-->
4934+
4935+
<xs:simpleType name="chooseCalendarEnum">
4936+
<xs:restriction base="xs:string">
4937+
<xs:enumeration value="" />
4938+
<xs:enumeration value="specific" />
4939+
<xs:enumeration value="site" />
4940+
</xs:restriction>
4941+
</xs:simpleType>
4942+
49294943
</xs:schema>

src/test/resources/cifs-good/9.2.2-themes-atomik-documentation-calendar-PATCHED.xml

Lines changed: 0 additions & 128 deletions
This file was deleted.

src/test/resources/cifs-bad/9.2.2-themes-atomik-documentation-calendar.xml renamed to src/test/resources/cifs-good/9.2.2-themes-atomik-documentation-calendar.xml

File renamed without changes.

0 commit comments

Comments
 (0)