From 9cbc5322ad1d8dd3b72e2e94b900de5a63f53263 Mon Sep 17 00:00:00 2001
From: Simon Martens <simonmartens@mailbox.org>
Date: Wed, 8 May 2024 00:12:07 +0200
Subject: [PATCH] =?UTF-8?q?Beitr=C3=A4ge=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 XSD/beitraege.xsd | 108 ++++++++++++++++++++++++++++++++++++++++++++--
 XSD/werke.xsd     |   4 +-
 beitraege.xml     |  12 +++++-
 3 files changed, 118 insertions(+), 6 deletions(-)

diff --git a/XSD/beitraege.xsd b/XSD/beitraege.xsd
index 02cc839..147a9c2 100644
--- a/XSD/beitraege.xsd
+++ b/XSD/beitraege.xsd
@@ -2,10 +2,112 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     targetNamespace="https://www.kgpz.de"
     xmlns="https://www.kgpz.de"
-    xmlns:kgpz="https://www.kgpz.de" 
+    xmlns:kgpz="https://www.kgpz.de"
     elementFormDefault="qualified">
 
-    <xsd:element name="beitraege" type="beitraege" />
+    <xsd:include schemaLocation="common.xsd"></xsd:include>
+    <xsd:element name="beitraege">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="beitrag" maxOccurs="unbounded">
+                    <xsd:complexType>
+                        <xsd:choice>
+                            <xsd:sequence>
+                                <xsd:choice>
+                                    <xsd:element name="stueck" type="kgpz:StueckBeitragRef"
+                                        minOccurs="1" maxOccurs="unbounded" />
+                                    <xsd:element name="beilage" type="kgpz:StueckBeilageRef"
+                                        minOccurs="1" maxOccurs="unbounded" />
+                                    <xsd:sequence>
+                                        <xsd:element name="stueck" type="kgpz:StueckBeitragRef"
+                                            minOccurs="1" maxOccurs="unbounded" />
+                                        <xsd:element name="beilage" type="kgpz:StueckBeilageRef"
+                                            minOccurs="1" maxOccurs="unbounded" />
+                                    </xsd:sequence>
+                                </xsd:choice>
+                                <xsd:element name="titel" type="kgpz:NonEmptyString" minOccurs="1"
+                                    maxOccurs="1" />
+                                <xsd:element name="incipit" type="kgpz:NonEmptyString" minOccurs="0"
+                                    maxOccurs="1" />
+                                <xsd:group ref="kgpz:BeitragInfo" />
+                            </xsd:sequence>
+                            <xsd:sequence>
+                                <xsd:choice>
+                                    <xsd:element name="stueck" type="kgpz:StueckBeitragRef"
+                                        minOccurs="1" maxOccurs="unbounded" />
+                                    <xsd:element name="beilage" type="kgpz:StueckBeilageRef"
+                                        minOccurs="1" maxOccurs="unbounded" />
+                                    <xsd:sequence>
+                                        <xsd:element name="stueck" type="kgpz:StueckBeitragRef"
+                                            minOccurs="1" maxOccurs="unbounded" />
+                                        <xsd:element name="beilage" type="kgpz:StueckBeilageRef"
+                                            minOccurs="1" maxOccurs="unbounded" />
+                                    </xsd:sequence>
+                                </xsd:choice>
+                                <xsd:element name="incipit" type="kgpz:NonEmptyString" minOccurs="1"
+                                    maxOccurs="1" />
+                                <xsd:group ref="kgpz:BeitragInfo" />
+                            </xsd:sequence>
+                        </xsd:choice>
+                    </xsd:complexType>
+                </xsd:element>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
 
-    <xsd:complexType name="beitraege"></xsd:complexType>
+
+    <xsd:complexType name="StueckBeitragRef">
+        <xsd:attribute name="jahr" type="kgpz:Year"
+            use="required" />
+        <xsd:attribute name="nr" type="xsd:positiveInteger"
+            use="required" />
+        <xsd:attribute name="von" type="xsd:positiveInteger"
+            use="required" />
+        <xsd:attribute name="bis" type="xsd:positiveInteger"
+            use="optional" />
+    </xsd:complexType>
+
+    <xsd:complexType name="StueckBeilageRef">
+        <xsd:attribute name="jahr" type="kgpz:Year"
+            use="required" />
+        <xsd:attribute name="nr" type="xsd:positiveInteger"
+            use="required" />
+        <xsd:attribute name="beilage" type="xsd:positiveInteger"
+            use="required" />
+        <xsd:attribute name="von" type="xsd:positiveInteger"
+            use="optional" />
+        <xsd:attribute name="bis" type="xsd:positiveInteger"
+            use="optional" />
+    </xsd:complexType>
+
+    <xsd:group name="BeitragInfo">
+        <xsd:sequence>
+            <xsd:element name="datum" type="xsd:date" minOccurs="1"
+                maxOccurs="1" />
+            <xsd:element name="ort" minOccurs="0" maxOccurs="1">
+                <xsd:complexType>
+                    <xsd:attribute name="ref" type="kgpz:NonEmptyString"
+                        use="required" />
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="autorschaft" minOccurs="0" maxOccurs="unbounded">
+                <xsd:complexType>
+                    <xsd:attribute name="ref" type="kgpz:NonEmptyString"
+                        use="required" />
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="kategorie" minOccurs="1" maxOccurs="unbounded">
+                <xsd:complexType>
+                    <xsd:attribute name="ref" type="kgpz:NonEmptyString"
+                        use="required" />
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="rezensiert" minOccurs="0" maxOccurs="unbounded">
+                <xsd:complexType>
+                    <xsd:attribute name="ref" type="kgpz:NonEmptyString"
+                        use="required" />
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:group>
 </xsd:schema>
\ No newline at end of file
diff --git a/XSD/werke.xsd b/XSD/werke.xsd
index 16a3e49..59908a7 100644
--- a/XSD/werke.xsd
+++ b/XSD/werke.xsd
@@ -12,11 +12,11 @@
             <xsd:sequence>
                 <xsd:element name="werk" maxOccurs="unbounded">
                     <xsd:complexType>
-                        <xsd:choice>
+                        <xsd:sequence>
                             <xsd:element name="daten" type="kgpz:citation" minOccurs="0" maxOccurs="1" />
                             <xsd:element name="zitation" type="NonEmptyString" minOccurs="0" maxOccurs="1" />
                             <xsd:element name="anmerkung" type="kgpz:NonEmptyString" minOccurs="0" maxOccurs="unbounded" />
-                        </xsd:choice>
+                        </xsd:sequence>
                         <xsd:attribute name="id" type="xsd:string" use="required" />
                     </xsd:complexType>
                 </xsd:element>
diff --git a/beitraege.xml b/beitraege.xml
index c869bd6..dfa1713 100644
--- a/beitraege.xml
+++ b/beitraege.xml
@@ -1,4 +1,14 @@
 <?xml version="1.0"?>
 <beitraege xmlns="https://www.kgpz.de"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="https://www.kgpz.de XSD_Schemata/KGPZ.xsd"></beitraege>
\ No newline at end of file
+    xsi:schemaLocation="https://www.kgpz.de XSD/KGPZ.xsd">
+    <beitrag>
+        <stueck jahr="1752" nr="23" von="2" />
+        <stueck jahr="1799" nr="12" von="5" />
+        <titel>Was</titel>
+        <datum>1762-12-12</datum>
+        <ort ref="ort" />
+        <autorschaft ref="autor" />
+        <kategorie ref="kategorie" />
+    </beitrag>
+</beitraege>
\ No newline at end of file