From c5d84f108217dbaa89a457ff33f9f410f9ff79c8 Mon Sep 17 00:00:00 2001
From: Landry Breuil <breuil@craig.fr>
Date: Fri, 2 Feb 2024 11:43:49 +0100
Subject: [PATCH 1/5] wip for better csw-dcat output for data.gouv.fr, from
 @jeanpommier (#4182)

---
 .../main/plugin/iso19139/layout/tpl-rdf.xsl   | 109 +++++++++++++++---
 1 file changed, 92 insertions(+), 17 deletions(-)

diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
index adf1551155..ef235918bf 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
@@ -104,6 +104,7 @@
     <xsl:param name="uuid"/>
 
     <dct:references>
+      <!-- SIB addon-->
       <rdf:Description rdf:about="{$url}/srv/api/records/{$uuid}/formatters/xml">
         <dct:format>
           <dct:IMT>
@@ -115,7 +116,9 @@
     </dct:references>
 
     <dct:references>
-      <rdf:Description rdf:about="{$url}/srv/api/records/{$uuid}">
+      <!-- SIB addon-->
+      <!-- <rdf:Description rdf:about="{$url}/srv/api/records/{$uuid}"> -->
+      <rdf:Description rdf:about="{$url}/srv/fre/catalog.search#/metadata/{$uuid}">
         <dct:format>
           <dct:IMT>
             <rdf:value>text/html</rdf:value>
@@ -187,6 +190,14 @@
             <xsl:value-of select="(gmd:protocol/gmx:Anchor)[1]"/>
           </dcat:mediaType>
           </xsl:if>
+
+          <!-- SIB addon-->
+          <xsl:if test="(gmd:description/gco:CharacterString)[1]!=''">
+          <dct:description>
+            <xsl:value-of select="(gmd:description/gco:CharacterString)[1]"/>
+          </dct:description>
+          </xsl:if>
+
           <xsl:if test="(gmd:protocol/gco:CharacterString)[1]!=''">
           <dct:format>
             <xsl:value-of select="(gmd:protocol/gco:CharacterString)[1]"/>
@@ -273,7 +284,10 @@
   -->
   <xsl:template match="gmd:MD_DataIdentification|*[contains(@gco:isoType, 'MD_DataIdentification')]"
                 mode="to-dcat">
-    <dcat:Dataset rdf:about="{$resourcePrefix}/datasets/{iso19139:getResourceCode(../../.)}">
+
+    <!-- SIB addon-->
+    <!-- <dcat:Dataset rdf:about="{$resourcePrefix}/datasets/{iso19139:getResourceCode(../../.)}"> -->
+    <dcat:Dataset rdf:about="{$resourcePrefix}/{iso19139:getResourceCode(../../.)}">
       <xsl:call-template name="to-dcat"/>
     </dcat:Dataset>
   </xsl:template>
@@ -290,6 +304,10 @@
     </dct:identifier>
     <!-- xpath: gmd:identificationInfo/*/gmd:citation/*/gmd:identifier/*/gmd:code -->
 
+    <!-- SIB addon-->
+    <dcat:landingPage>
+      <xsl:value-of select="$resourcePrefix"/>/<xsl:value-of select="iso19139:getResourceCode(../../.)"/>
+    </dcat:landingPage>
 
     <dct:title>
       <xsl:value-of select="gmd:citation/*/gmd:title/gco:CharacterString"/>
@@ -299,6 +317,16 @@
 
     <dct:abstract>
       <xsl:value-of select="gmd:abstract/gco:CharacterString"/>
+
+      <!-- SIB addon-->
+      <!-- Layout will be visible only in source mode in the browser. If not in source mode, newlines won't be displayed and the keywords will be shown inline -->
+      <xsl:text>&#xa;</xsl:text> <!-- linebreak -->
+      <!-- Keywords -->
+      <xsl:for-each-group select="//gmd:MD_Keywords[(gmd:thesaurusName)]/gmd:keyword"
+      group-by="gco:CharacterString|gmx:Anchor">
+        <xsl:text>&#xa;</xsl:text> <!-- linebreak -->
+        <xsl:value-of select="normalize-space(../gmd:thesaurusName/*/gmd:title)"/> : <xsl:value-of select="normalize-space(gco:CharacterString|gmx:Anchor)"/><xsl:text>.</xsl:text>
+      </xsl:for-each-group>
     </dct:abstract>
     <!-- xpath: gmd:identificationInfo/*/gmd:abstract/gco:CharacterString -->
 
@@ -427,26 +455,45 @@
     <!-- xpath: gmd:identificationInfo/*/gmd:language/gmd:LanguageCode/@codeListValue -->
 
 
+    <!-- dct:license content -->
     <!-- "The license under which the dataset is published and can be reused." -->
-    <xsl:for-each select="gmd:resourceConstraints/gmd:MD_LegalConstraints/*/gmd:MD_RestrictionCode[@codeListValue!='otherRestrictions']">
-      <dct:license>
-        <xsl:value-of select="@codeListValue"/>
-      </dct:license>
+    <xsl:for-each select="gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:useConstraints">
+      <xsl:choose>
+        <xsl:when test="gmd:MD_RestrictionCode[@codeListValue!='otherRestrictions']">
+          <dct:license>
+            <xsl:value-of select="@codeListValue"/>
+          </dct:license>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:call-template name="legalOtherConstraints">
+              <xsl:with-param name="ocnode"><xsl:copy-of select="./following-sibling::gmd:otherConstraints[1]"/></xsl:with-param>
+              <xsl:with-param name="tagname">license</xsl:with-param>
+            </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:for-each>
-    <xsl:for-each
-      select="gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:otherConstraints/gco:CharacterString">
-      <dct:license>
-        <xsl:value-of select="."/>
-      </dct:license>
-    </xsl:for-each>
-    <xsl:for-each
-      select="gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:otherConstraints/gmx:Anchor">
-      <dct:license rdf:resource="{@xlink:href}">
-        <xsl:value-of select="."/>
-      </dct:license>
+
+    <!--  Access constraints should not be stored under license, but rather on accessRights category,
+          cf https://semiceu.github.io/GeoDCAT-AP/releases/2.0.0/#conditions-for-access-and-use-and-limitations-on-public-access-use-limitation-and-access-other-constraints 
+    -->
+    <xsl:for-each select="gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:accessConstraints">
+      <xsl:choose>
+        <xsl:when test="gmd:MD_RestrictionCode[@codeListValue!='otherRestrictions']">
+          <dct:license>
+            <xsl:value-of select="@codeListValue"/>
+          </dct:license>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:call-template name="legalOtherConstraints">
+              <xsl:with-param name="ocnode"><xsl:copy-of select="./following-sibling::gmd:otherConstraints[1]"/></xsl:with-param>
+              <xsl:with-param name="tagname">accessRights</xsl:with-param>
+            </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:for-each>
     <!-- xpath: gmd:identificationInfo/*/gmd:resourceConstraints/??? -->
 
+
     <xsl:for-each select="../../gmd:distributionInfo/*/gmd:transferOptions/*/gmd:onLine">
       <dcat:distribution rdf:resource="{iso19139:RecordUri($uuid)}#{encode-for-uri(gmd:CI_OnlineResource/gmd:protocol/*/text())}-{encode-for-uri(gmd:CI_OnlineResource/gmd:name/(gco:CharacterString|gmx:Anchor)/text())}"/>
     </xsl:for-each>
@@ -522,6 +569,34 @@
   </xsl:template>
 
 
+  <!--
+    Process the otherContraints in LegalResources differently depending on the previous sibling. If gmd:useConstraints use dct:license, if gmd:accessConstraints use dct:accessRights
+  -->
+  <xsl:template name="legalOtherConstraints">
+    <xsl:param name="ocnode"/>
+    <xsl:param name="tagname"/>
+
+    <xsl:choose>
+      <xsl:when test="$ocnode/gmd:otherConstraints/gmx:Anchor">
+        <xsl:element name="dct:{$tagname}">
+          <xsl:attribute name="rdf:resource">
+              <xsl:value-of select="$ocnode/gmd:otherConstraints/gmx:Anchor/@xlink:href"/>
+          </xsl:attribute>
+          <xsl:value-of select="$ocnode/gmd:otherConstraints/gmx:Anchor"/>
+        </xsl:element>
+      </xsl:when>
+      <xsl:when test="$ocnode/gmd:otherConstraints/gco:CharacterString">
+        <xsl:element name="dct:{$tagname}">
+          <xsl:value-of select="$ocnode/gmd:otherConstraints/gco:CharacterString"/>
+        </xsl:element>
+      </xsl:when>
+      <!--      <xsl:otherwise>-->
+      <!--          <xsl:copy-of select="$ocnode"/>-->
+      <!--      </xsl:otherwise>-->
+    </xsl:choose>
+  </xsl:template>
+
+
   <!--
     Get resource (dataset or service) identifier if set and return metadata UUID if not.
   -->

From 24cf7afe572a6b6d661d007e326104d20d316d4a Mon Sep 17 00:00:00 2001
From: Landry Breuil <breuil@craig.fr>
Date: Fri, 2 Feb 2024 15:56:51 +0100
Subject: [PATCH 2/5] create a link that resolves to a md page for landingPage

---
 schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
index ef235918bf..92b67c7825 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
@@ -306,7 +306,7 @@
 
     <!-- SIB addon-->
     <dcat:landingPage>
-      <xsl:value-of select="$resourcePrefix"/>/<xsl:value-of select="iso19139:getResourceCode(../../.)"/>
+      <xsl:value-of select="$url"/>/srv/api/records/<xsl:value-of select="$uuid"/>
     </dcat:landingPage>
 
     <dct:title>

From 24105e2525e88908d0cea3d10a6af09d12aeb4cd Mon Sep 17 00:00:00 2001
From: Landry Breuil <breuil@craig.fr>
Date: Mon, 19 Feb 2024 13:19:36 +0100
Subject: [PATCH 3/5] use util:getNodeId instead of hardcoding srv in
 dcat:landingPage

---
 schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
index 92b67c7825..0c01d006de 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
@@ -306,7 +306,7 @@
 
     <!-- SIB addon-->
     <dcat:landingPage>
-      <xsl:value-of select="$url"/>/srv/api/records/<xsl:value-of select="$uuid"/>
+      <xsl:value-of select="$url"/>/<xsl:value-of select="util:getNodeId()"/>/api/records/<xsl:value-of select="$uuid"/>
     </dcat:landingPage>
 
     <dct:title>

From d0e5f1b0c2f6cf5904768ec5e87d03ef335d5c00 Mon Sep 17 00:00:00 2001
From: Landry Breuil <breuil@craig.fr>
Date: Wed, 20 Mar 2024 17:35:44 +0100
Subject: [PATCH 4/5] cleanup after discussion with @jeanpommier

---
 .../main/plugin/iso19139/layout/tpl-rdf.xsl   | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
index 0c01d006de..cf0368fce5 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
@@ -104,7 +104,6 @@
     <xsl:param name="uuid"/>
 
     <dct:references>
-      <!-- SIB addon-->
       <rdf:Description rdf:about="{$url}/srv/api/records/{$uuid}/formatters/xml">
         <dct:format>
           <dct:IMT>
@@ -116,8 +115,7 @@
     </dct:references>
 
     <dct:references>
-      <!-- SIB addon-->
-      <!-- <rdf:Description rdf:about="{$url}/srv/api/records/{$uuid}"> -->
+      <!-- geOrchestra change: use a 'nice' HTML view for the md description url-->
       <rdf:Description rdf:about="{$url}/srv/fre/catalog.search#/metadata/{$uuid}">
         <dct:format>
           <dct:IMT>
@@ -191,7 +189,7 @@
           </dcat:mediaType>
           </xsl:if>
 
-          <!-- SIB addon-->
+          <!-- geOrchestra addition: put the description of the attached file -> fills the 'Description des données' field in uData -->
           <xsl:if test="(gmd:description/gco:CharacterString)[1]!=''">
           <dct:description>
             <xsl:value-of select="(gmd:description/gco:CharacterString)[1]"/>
@@ -284,9 +282,7 @@
   -->
   <xsl:template match="gmd:MD_DataIdentification|*[contains(@gco:isoType, 'MD_DataIdentification')]"
                 mode="to-dcat">
-
-    <!-- SIB addon-->
-    <!-- <dcat:Dataset rdf:about="{$resourcePrefix}/datasets/{iso19139:getResourceCode(../../.)}"> -->
+    <!-- geOrchestra change: /datasets/ doesnt map to anything, use the same as rdf:Description -->
     <dcat:Dataset rdf:about="{$resourcePrefix}/{iso19139:getResourceCode(../../.)}">
       <xsl:call-template name="to-dcat"/>
     </dcat:Dataset>
@@ -304,7 +300,7 @@
     </dct:identifier>
     <!-- xpath: gmd:identificationInfo/*/gmd:citation/*/gmd:identifier/*/gmd:code -->
 
-    <!-- SIB addon-->
+    <!-- geOrchestra addition: provide an HTML record view for the 'Voir la source originale' link -->
     <dcat:landingPage>
       <xsl:value-of select="$url"/>/<xsl:value-of select="util:getNodeId()"/>/api/records/<xsl:value-of select="$uuid"/>
     </dcat:landingPage>
@@ -317,16 +313,6 @@
 
     <dct:abstract>
       <xsl:value-of select="gmd:abstract/gco:CharacterString"/>
-
-      <!-- SIB addon-->
-      <!-- Layout will be visible only in source mode in the browser. If not in source mode, newlines won't be displayed and the keywords will be shown inline -->
-      <xsl:text>&#xa;</xsl:text> <!-- linebreak -->
-      <!-- Keywords -->
-      <xsl:for-each-group select="//gmd:MD_Keywords[(gmd:thesaurusName)]/gmd:keyword"
-      group-by="gco:CharacterString|gmx:Anchor">
-        <xsl:text>&#xa;</xsl:text> <!-- linebreak -->
-        <xsl:value-of select="normalize-space(../gmd:thesaurusName/*/gmd:title)"/> : <xsl:value-of select="normalize-space(gco:CharacterString|gmx:Anchor)"/><xsl:text>.</xsl:text>
-      </xsl:for-each-group>
     </dct:abstract>
     <!-- xpath: gmd:identificationInfo/*/gmd:abstract/gco:CharacterString -->
 
@@ -455,7 +441,7 @@
     <!-- xpath: gmd:identificationInfo/*/gmd:language/gmd:LanguageCode/@codeListValue -->
 
 
-    <!-- dct:license content -->
+    <!-- dct:license content - geOrchestra addition -->
     <!-- "The license under which the dataset is published and can be reused." -->
     <xsl:for-each select="gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:useConstraints">
       <xsl:choose>
@@ -493,7 +479,6 @@
     </xsl:for-each>
     <!-- xpath: gmd:identificationInfo/*/gmd:resourceConstraints/??? -->
 
-
     <xsl:for-each select="../../gmd:distributionInfo/*/gmd:transferOptions/*/gmd:onLine">
       <dcat:distribution rdf:resource="{iso19139:RecordUri($uuid)}#{encode-for-uri(gmd:CI_OnlineResource/gmd:protocol/*/text())}-{encode-for-uri(gmd:CI_OnlineResource/gmd:name/(gco:CharacterString|gmx:Anchor)/text())}"/>
     </xsl:for-each>
@@ -569,7 +554,7 @@
   </xsl:template>
 
 
-  <!--
+  <!-- geOrchestra addition
     Process the otherContraints in LegalResources differently depending on the previous sibling. If gmd:useConstraints use dct:license, if gmd:accessConstraints use dct:accessRights
   -->
   <xsl:template name="legalOtherConstraints">

From 2a26e627f7f3867027002e350d38f9496da845ad Mon Sep 17 00:00:00 2001
From: Landry Breuil <breuil@craig.fr>
Date: Wed, 20 Mar 2024 17:55:08 +0100
Subject: [PATCH 5/5] we shouldnt have two dct:licence blocks

---
 schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
index cf0368fce5..8137aa8569 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl
@@ -465,9 +465,9 @@
     <xsl:for-each select="gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:accessConstraints">
       <xsl:choose>
         <xsl:when test="gmd:MD_RestrictionCode[@codeListValue!='otherRestrictions']">
-          <dct:license>
+          <dct:accessRights>
             <xsl:value-of select="@codeListValue"/>
-          </dct:license>
+          </dct:accessRights>
         </xsl:when>
         <xsl:otherwise>
             <xsl:call-template name="legalOtherConstraints">