From e49ef40281c060cf190a6dbf7aec3a0b597bdf30 Mon Sep 17 00:00:00 2001
From: Francois Prunayre <fx.prunayre@gmail.com>
Date: Wed, 13 Nov 2024 11:27:45 +0100
Subject: [PATCH] DCAT / Align with GeoNetwork. Add support for multiple
 useConstraints.

---
 .../formatter/dcat/dcat-core-access-and-use.xsl   | 15 ++++-----------
 .../iso19115-3.2018/formatter/dcat/dcat-core.xsl  |  8 +++++++-
 .../formatter/dcat/dcat-variables.xsl             | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl
index a04bf058096..d86da928861 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl
@@ -56,8 +56,8 @@
   Usage note:	Information about licenses and rights MAY be provided for the Resource. See also guidance at 9. License and rights statements.
   -->
   <xsl:template mode="iso19115-3-to-dcat"
-                match="mdb:identificationInfo/*/mri:resourceConstraints/*[mco:accessConstraints]">
-    <xsl:if test="count(../preceding-sibling::mri:resourceConstraints/*[mco:accessConstraints]) = 0">
+                match="mdb:identificationInfo/*/mri:resourceConstraints/*">
+    <xsl:if test="count(../preceding-sibling::mri:resourceConstraints/*) = 0">
       <xsl:for-each select="../../mri:resourceConstraints/*[mco:accessConstraints]/mco:otherConstraints">
         <xsl:if test="position() = 1 or ($isPreservingAllResourceConstraints and position() > 1)">
           <xsl:element name="{if (position() = 1) then 'dct:accessRights' else 'dct:rights'}">
@@ -76,18 +76,11 @@
           </xsl:element>
         </xsl:if>
       </xsl:for-each>
-    </xsl:if>
-  </xsl:template>
 
-
-  <xsl:template mode="iso19115-3-to-dcat"
-                name="iso19115-3-to-dcat-license"
-                match="mdb:identificationInfo/*/mri:resourceConstraints/*[mco:useConstraints]">
-    <xsl:if test="count(../preceding-sibling::mri:resourceConstraints/*[mco:useConstraints]) = 0">
       <xsl:variable name="useConstraints"
                     as="node()*">
-        <xsl:copy-of select="ancestor::mri:resourceConstraints/*[mco:useConstraints]/mco:otherConstraints"/>
-        <xsl:copy-of select="ancestor::mri:resourceConstraints/*[mco:useConstraints]/mco:useLimitation"/>
+        <xsl:copy-of select="../../mri:resourceConstraints/*[mco:useConstraints]/mco:otherConstraints"/>
+        <xsl:copy-of select="../../mri:resourceConstraints/*[mco:useConstraints]/mco:useLimitation"/>
       </xsl:variable>
 
       <xsl:variable name="licensesAndRights" as="node()*">
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 daca1b8fa18..ed6a811ecf9 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
@@ -275,9 +275,15 @@
                       |mri:otherLocale
                       |mdb:defaultLocale
                       |mdb:otherLocale">
+    <xsl:variable name="languageValue"
+                  as="xs:string?"
+                  select="if ($isoToDcatLanguage[@key = current()/*/lan:language/*/@codeListValue])
+                          then $isoToDcatLanguage[@key = current()/*/lan:language/*/@codeListValue]
+                          else */lan:language/*/@codeListValue"/>
+
     <dct:language>
       <!-- TO CHECK: In DCAT, maybe we should use another base URI? -->
-      <dct:LinguisticSystem rdf:about="{concat($europaPublicationLanguage, upper-case(*/lan:language/*/@codeListValue))}"/>
+      <dct:LinguisticSystem rdf:about="{concat($europaPublicationLanguage, upper-case($languageValue))}"/>
     </dct:language>
   </xsl:template>
 
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 ae584706bab..037b7f530e8 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
@@ -203,4 +203,18 @@
     <entry key="https://publications.europa.eu/resource/authority/file-type/GML">wps</entry>
     <entry key="https://publications.europa.eu/resource/authority/file-type/ZIP">zip</entry>
   </xsl:variable>
+
+  <!-- DCAT uses the terminology code, while ISO uses bibliographic code.
+       For some languages like Dutch, French or German the values differ. -->
+  <xsl:variable name="isoToDcatLanguage"
+                as="node()*">
+    <entry key="dut">nld</entry> <!-- Dutch -->
+    <entry key="cze">ces</entry> <!-- Czech -->
+    <entry key="ger">deu</entry> <!-- German -->
+    <entry key="gre">ell</entry> <!-- Greek -->
+    <entry key="fre">fra</entry> <!-- French -->
+    <entry key="rum">ron</entry> <!-- Romanian -->
+    <entry key="slo">slk</entry> <!-- Slovak -->
+    <entry key="ice">isl</entry> <!-- Icelandic-->
+  </xsl:variable>
 </xsl:stylesheet>