MET-5556 update hasQualityAnotation in schema

europeana · Nov 23, 2023 · dc004bf · dc004bf
1 parent 499f62a
commit dc004bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/src/main/resources/schema_xsds/DQV.xsd b/src/main/resources/schema_xsds/DQV.xsd
@@ -3,31 +3,24 @@
   targetNamespace="http://www.w3.org/ns/dqv#"
   xmlns:dqv="http://www.w3.org/ns/dqv#"
   xmlns:oa="http://www.w3.org/ns/oa#"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:dcterms="http://purl.org/dc/terms/" elementFormDefault="qualified">
-  <import namespace="http://www.w3.org/1999/02/22-rdf-syntax-ns#" schemaLocation="RDF.xsd"/>
   <import namespace="http://purl.org/dc/terms/" schemaLocation="DCTERMS.xsd"/>
   <import namespace="http://www.w3.org/ns/oa#" schemaLocation="OA.xsd"/>
 
-  <element name="hasQualityAnnotation" type="rdf:ResourceType">
+  <element name="hasQualityAnnotation">
     <annotation>
       <documentation>The identifier of the Quality annotation. Example:
-        &lt;dqv:hasQualityAnnotation rdf:resource="#metadataTier"/&gt;
+        &lt;dqv:hasQualityAnnotation/&gt;
       </documentation>
     </annotation>
-
   </element>
   <element name="QualityAnnotation">
     <complexType>
-      <complexContent>
-        <extension base="rdf:AboutType">
-          <sequence minOccurs="1" maxOccurs="1">
-            <element ref="dcterms:created" minOccurs="1" maxOccurs="1"/>
-            <element ref="oa:hasTarget" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="oa:hasBody" minOccurs="1" maxOccurs="1"/>
-          </sequence>
-        </extension>
-      </complexContent>
+      <sequence minOccurs="1" maxOccurs="1">
+        <element ref="dcterms:created" minOccurs="1" maxOccurs="1"/>
+        <element ref="oa:hasTarget" minOccurs="1" maxOccurs="unbounded"/>
+        <element ref="oa:hasBody" minOccurs="1" maxOccurs="1"/>
+      </sequence>
     </complexType>
   </element>
-</schema>
+</schema>
diff --git a/src/main/resources/schema_xsds/EDM-INTERNAL-MAIN.xsd b/src/main/resources/schema_xsds/EDM-INTERNAL-MAIN.xsd
@@ -66,7 +66,6 @@
             <element ref="foaf:Organization" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="dcat:Dataset" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="svcs:Service" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="dqv:QualityAnnotation" minOccurs="0" maxOccurs="unbounded"/>
         </sequence>
     </complexType>
 

diff --git a/src/main/resources/schema_xsds/ORE.xsd b/src/main/resources/schema_xsds/ORE.xsd
@@ -4,6 +4,7 @@
 	xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns:dcterms="http://purl.org/dc/terms/" xmlns:enrichment="http://www.europeana.eu/schemas/edm/enrichment/"
 		xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+  xmlns:dqv="http://www.w3.org/ns/dqv#"
 	elementFormDefault="qualified">
 
 	<annotation>
@@ -21,7 +22,8 @@
 		schemaLocation="ENRICHMENT.xsd" />
 	<import namespace="http://www.w3.org/2002/07/owl#"
 		schemaLocation="OWL.xsd" />
-
+  <import namespace="http://www.w3.org/ns/dqv#"
+    schemaLocation="DQV.xsd" />
 	<element name="Aggregation">
 		<complexType>
 			<annotation>
@@ -104,6 +106,7 @@
 						<element ref="edm:rights" maxOccurs="1" minOccurs="1" />
 						<element ref="edm:ugc" maxOccurs="1" minOccurs="0" />
 						<element ref="edm:intermediateProvider" maxOccurs="unbounded" minOccurs="0"/>
+						<element ref="dqv:hasQualityAnnotation" maxOccurs="unbounded" minOccurs="0"/>
 					</sequence>
 				</extension>
 			</complexContent>