Formatter / EU-DCAT-AP / Improve shacl validation status - only one d…

…ct:type allowed.
SPW-DIG · Dec 15, 2023 · d8b4c7a · d8b4c7a
1 parent b85e1e5
commit d8b4c7a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core.xsl
@@ -320,7 +320,7 @@
     <xsl:if test="$dcmiType">
       <dct:type rdf:resource="http://purl.org/dc/dcmitype/{$dcmiType}"/>
     </xsl:if>
-    <xsl:if test="current() != ''">
+    <xsl:if test="$isPreservingIsoType and current() != ''">
       <dct:type rdf:resource="{concat($isoCodeListBaseUri, current())}"/>
     </xsl:if>
     <!-- TODO: Add mapping to Datacite https://schema.datacite.org/meta/kernel-4.1/include/datacite-resourceType-v4.1.xsd ?-->

diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-variables.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-variables.xsl
@@ -8,6 +8,10 @@
   <xsl:param name="isExpandSkosConcept"
              select="xs:boolean($expandSkosConcept)"/>
 
+  <xsl:variable name="isPreservingIsoType"
+                as="xs:boolean"
+                select="true()"/>
+
   <xsl:variable name="isPreservingAllResourceConstraints"
                 as="xs:boolean"
                 select="true()"/>

diff --git a/.../iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl b/.../iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl
@@ -18,6 +18,10 @@
   <xsl:variable name="isPreservingAllResourceConstraints"
                 as="xs:boolean"
                 select="false()"/>
+
+  <xsl:variable name="isPreservingIsoType"
+                as="xs:boolean"
+                select="false()"/>
   <!--
   Catalogue Record
   [o]	title	Literal	0..*	A name given to the Catalogue Record.	This property can be repeated for parallel language versions of the name.

diff --git a/...sources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core.rdf b/...sources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core.rdf
@@ -7,7 +7,6 @@
   <rdf:Description>
     <rdf:type rdf:resource="http://www.w3.org/ns/dcat#Dataset"/>
     <dct:type rdf:resource="http://purl.org/dc/dcmitype/Dataset"/>
-    <dct:type rdf:resource="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#dataset"/>
     <foaf:isPrimaryTopicOf>
       <rdf:Description>
         <rdf:type rdf:resource="http://www.w3.org/ns/dcat#CatalogRecord"/>