chore: improve XML and JSON Schemas (DEV-449) (#180)

* making element unique based on attribute name * In case of object:GeomValue, require hasGeometry as super * update schema-files * adapt test-data * update schema-files * adapt docs Co-authored-by: Vijeinath Tissaveerasingham <vijeinath@gmx.ch> Co-authored-by: Johannes Nussbaum <johannes.nussbaum@zoho.com> Co-authored-by: Johannes Nussbaum <39048939+jnussbaum@users.noreply.github.com>
dasch-swiss · Apr 25, 2022 · 2c17b9d · 2c17b9d
1 parent 5d2d109
commit 2c17b9d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 15 deletions.
diff --git a/docs/dsp-tools-create-ontologies.md b/docs/dsp-tools-create-ontologies.md
@@ -80,13 +80,13 @@ The following fields are mandatory:
 
 - `name`
 - `labels`
+- `super`
 - `object`
 - `gui_element`
 
 The following fields are optional:
 
 - `comments` 
-- `super` (with the exception of `LinkValue` where `super` is mandatory)
 - `subject`
 - `gui_attributes`
 
@@ -154,7 +154,7 @@ Comments with language tags. Currently, "de", "en", "fr" and "it" are supported.
 
 ### Super
 
-(optional)
+(required)
 
 `"super": ["<super-property>", "<super-property>, ...]`
 
@@ -165,7 +165,7 @@ including the prefix of the external or internal ontology - has to be given.
 
 The following base properties are defined by DSP:
 
-- `hasValue`: This is the most generic base and taken as default if `super` is omitted.
+- `hasValue`: This is the most generic base.
 - `hasLinkTo`: This value represents a link to another resource. You have to indicate the "_object_" as a prefixed name
   that identifies the resource class this link points to (a ":" prepended to the name is sufficient if the resource is
   defined in the current ontology).

diff --git a/knora/dsplib/schemas/data.xsd b/knora/dsplib/schemas/data.xsd
@@ -200,16 +200,16 @@
         </xs:simpleContent>
     </xs:complexType>
 
-    <!-- boolean value type -->
+    <!-- boolean value type-->
+
     <xs:complexType name="boolean_type">
-        <xs:simpleContent>
-            <xs:extension base="xs:boolean">
-                <xs:attribute name="comment" type="xs:string"/>
-                <xs:attribute name="permissions" type="xs:NCName" use="required"/>
-            </xs:extension>
-        </xs:simpleContent>
+    <xs:simpleContent>
+        <xs:extension base="xs:boolean">
+            <xs:attribute name="comment" type="xs:string"/>
+            <xs:attribute name="permissions" type="xs:NCName" use="required"/>
+        </xs:extension>
+    </xs:simpleContent>
     </xs:complexType>
-
     <!-- textprop_type -->
     <xs:complexType name="textprop_type">
         <xs:sequence>
@@ -334,7 +334,7 @@
     <!-- booleanprop_type -->
     <xs:complexType name="booleanprop_type">
         <xs:sequence>
-            <xs:element name="boolean" type="boolean_type" minOccurs="1" maxOccurs="unbounded"/>
+            <xs:element name="boolean" type="boolean_type" minOccurs="1" maxOccurs="1"/>
         </xs:sequence>
         <xs:attribute name="name" type="xs:string" use="required"/>
     </xs:complexType>
@@ -454,7 +454,12 @@
         <xs:complexType>
             <xs:sequence>
                 <xs:element name="permissions" type="permissions_type" minOccurs="0" maxOccurs="unbounded"/>
-                <xs:element name="resource" type="resource_type" minOccurs="1" maxOccurs="unbounded"/>
+                <xs:element name="resource" type="resource_type" minOccurs="1" maxOccurs="unbounded">
+                    <xs:unique name="UniqueNameAttr">
+                        <xs:selector xpath=".//*"/>
+                        <xs:field xpath="@name"/>
+                    </xs:unique>
+                </xs:element>
             </xs:sequence>
             <xs:attribute name="default-ontology" type="xs:string"/>
             <xs:attribute name="shortcode" type="knorashortcode_type"/>

diff --git a/knora/dsplib/schemas/ontology.json b/knora/dsplib/schemas/ontology.json
@@ -379,6 +379,7 @@
             },
             "required": [
                 "name",
+                "super",
                 "object",
                 "labels",
                 "gui_element"
@@ -475,6 +476,22 @@
                     },
                     "then": {
                         "properties": {
+                            "super": {
+                                "type": "array",
+                                "items": {
+                                    "type": "string",
+                                    "oneOf": [
+                                        {
+                                            "enum": [
+                                                "hasGeometry"
+                                            ]
+                                        },
+                                        {
+                                            "$ref": "#/definitions/prefixedname"
+                                        }
+                                    ]
+                                }
+                            },
                             "gui_element": {
                                 "enum": [
                                     "Geometry",
@@ -496,7 +513,7 @@
                         "properties": {
                             "gui_element": {
                                 "const":
-                                    "Geonames"
+                                "Geonames"
                             }
                         }
                     }

diff --git a/testdata/test-onto.json b/testdata/test-onto.json
@@ -293,7 +293,7 @@
                     {
                         "name": "hasGeometry",
                         "super": [
-                            "hasValue"
+                            "hasGeometry"
                         ],
                         "object": "GeomValue",
                         "labels": {