From d8b4c7a20583343329c11e93f2cc27c8bee14ca3 Mon Sep 17 00:00:00 2001
From: Francois Prunayre <fx.prunayre@gmail.com>
Date: Fri, 15 Dec 2023 08:30:03 +0100
Subject: [PATCH] Formatter / EU-DCAT-AP / Improve shacl validation status -
 only one dct:type allowed.

---
 .../main/plugin/iso19115-3.2018/formatter/dcat/dcat-core.xsl  | 2 +-
 .../plugin/iso19115-3.2018/formatter/dcat/dcat-variables.xsl  | 4 ++++
 .../iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl  | 4 ++++
 .../formatters/iso19115-3.2018-eu-dcat-ap-dataset-core.rdf    | 1 -
 4 files changed, 9 insertions(+), 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
index f3de5df66f9..d2e02546050 100644
--- 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
index 2458778d9cf..51e25d995d9 100644
--- 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/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl
index 002034c8ae5..c92a684510e 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl
+++ b/schemas/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/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core.rdf b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core.rdf
index c04309a8556..d7fa26aef42 100644
--- a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core.rdf
+++ b/services/src/test/resources/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"/>