From bee5bf4ba4df50a55842ce8c52646105c8b2fdbd Mon Sep 17 00:00:00 2001
From: Francois Prunayre <fx.prunayre@gmail.com>
Date: Tue, 1 Oct 2024 08:10:08 +0200
Subject: [PATCH] Formatter / DCAT / Identifier(s)

In DCAT and DCAT-AP, `dct:identifier` is 0..n.
Mobility DCAT restrict it to 0..1.

In DCAT-AP and extensions, only convert the first identifier as
`dct:identifier`; others as `adms:identifier`.
---
 .../formatter/dcat/dcat-core.xsl              |  2 ++
 .../eu-dcat-ap/eu-dcat-ap-core-dataset.xsl    | 13 ++++++-----
 ...core-multipleAccrualPeriodicityAllowed.rdf | 22 ++++++-------------
 ...so19115-3.2018-eu-dcat-ap-dataset-core.rdf | 22 ++++++-------------
 ...115-3.2018-eu-dcat-ap-hvd-dataset-core.rdf | 22 ++++++-------------
 ....2018-eu-dcat-ap-mobility-dataset-core.rdf | 22 ++++++-------------
 ...9115-3.2018-eu-geodcat-ap-dataset-core.rdf | 22 ++++++-------------
 7 files changed, 45 insertions(+), 80 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 53af5b3c037..61fec1a920e 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
@@ -210,6 +210,7 @@
   -->
   <xsl:template mode="iso19115-3-to-dcat"
                 match="mdb:metadataIdentifier
+                      |mdb:identificationInfo/*/mri:citation/*/cit:identifier
                       |cit:identifier">
     <xsl:variable name="code"
                   select="*/mcc:code/*/text()"/>
@@ -221,6 +222,7 @@
                                       (if (ends-with($codeSpace, '/')) then '' else '/'),
                                       $code)
                           else $code"/>
+
     <xsl:variable name="codeType"
                   select="if (matches($codeWithPrefix, '^https?://|urn:'))
                           then 'anyURI' else 'string'"/>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core-dataset.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core-dataset.xsl
index 449987dec3f..7985121d7d5 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core-dataset.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core-dataset.xsl
@@ -178,8 +178,7 @@
     <xsl:call-template name="iso19115-3-to-dcat-resource"/>
 
     <xsl:apply-templates mode="iso19115-3-to-eu-dcat-ap"
-                         select="mdb:identificationInfo/*/mri:citation/*/cit:identifier
-                                |mdb:resourceLineage/*/mrl:source"/>
+                         select="mdb:resourceLineage/*/mrl:source"/>
 
     <xsl:call-template name="rdf-eu-dcat-ap-theme"/>
   </xsl:template>
@@ -187,9 +186,14 @@
 
   <!--
   [o]	other identifier	Identifier	0..*	A secondary identifier of the Dataset, such as MAST/ADS17, DataCite18, DOI19, EZID20 or W3ID21.
+
+  Only the first resource identifier is mapped to dct:identifier (even if more are allowed in DCAT or DCAT-AP)
+  because MobilityDCAT restrict it to 0..1. The other identifiers are mapped to adms:identifier.
+  https://www.w3.org/TR/vocab-adms/#identifier
   -->
-  <xsl:template mode="iso19115-3-to-eu-dcat-ap"
-                match="cit:identifier">
+  <xsl:template mode="iso19115-3-to-dcat"
+                match="mdb:identificationInfo/*/mri:citation/*/cit:identifier[position() > 1]"
+                priority="20">
     <xsl:variable name="code"
                   select="*/mcc:code/*/text()"/>
     <xsl:variable name="codeSpace"
@@ -211,7 +215,6 @@
   </xsl:template>
 
 
-
   <!--
   applicable legislation	Legal Resource	0..*	The legislation that mandates the creation or management of the Dataset.
   -->
diff --git a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core-multipleAccrualPeriodicityAllowed.rdf b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core-multipleAccrualPeriodicityAllowed.rdf
index 53c215ebf6a..1ae9bbecde3 100644
--- a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core-multipleAccrualPeriodicityAllowed.rdf
+++ b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core-multipleAccrualPeriodicityAllowed.rdf
@@ -98,7 +98,13 @@
     <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2023-02-21</dct:issued>
     <dcat:version>1.0</dcat:version>
     <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">http://geodata.wallonie.be/id/7fe2f305-1302-4297-b67e-792f55acd834</dct:identifier>
-    <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">BE.SPW.INFRASIG.CARTON/DGATLPE__PDS</dct:identifier>
+      <adms:identifier>
+         <rdf:Description>
+            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
+            <skos:notation>DGATLPE__PDS</skos:notation>
+            <adms:schemaAgency>BE.SPW.INFRASIG.CARTON</adms:schemaAgency>
+         </rdf:Description>
+      </adms:identifier>
     <dct:description xml:lang="fre">Le plan de secteur est un outil réglementaire d'aménagement du territoire et d'urbanisme
       régional wallon constitué de plusieurs couches de données spatiales.
 
@@ -424,20 +430,6 @@
           - une nouvelle zone non destinée à l'urbanisation : zone d'extraction (ZE).</dct:description>
       </dct:ProvenanceStatement>
     </dct:provenance>
-    <adms:identifier>
-      <rdf:Description>
-        <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
-        <skos:notation>7fe2f305-1302-4297-b67e-792f55acd834</skos:notation>
-        <adms:schemaAgency>http://geodata.wallonie.be/id/</adms:schemaAgency>
-      </rdf:Description>
-    </adms:identifier>
-    <adms:identifier>
-      <rdf:Description>
-        <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
-        <skos:notation>DGATLPE__PDS</skos:notation>
-        <adms:schemaAgency>BE.SPW.INFRASIG.CARTON</adms:schemaAgency>
-      </rdf:Description>
-    </adms:identifier>
     <dcat:theme>
       <skos:Concept rdf:about="http://publications.europa.eu/resource/authority/data-theme/AGRI">
         <skos:prefLabel xml:lang="fr">Agriculture, pêche, sylviculture et alimentation</skos:prefLabel>
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 fb929cfe444..455dd145754 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
@@ -98,7 +98,13 @@
       <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2023-02-21</dct:issued>
       <dcat:version>1.0</dcat:version>
       <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">http://geodata.wallonie.be/id/7fe2f305-1302-4297-b67e-792f55acd834</dct:identifier>
-      <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">BE.SPW.INFRASIG.CARTON/DGATLPE__PDS</dct:identifier>
+      <adms:identifier>
+         <rdf:Description>
+            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
+            <skos:notation>DGATLPE__PDS</skos:notation>
+            <adms:schemaAgency>BE.SPW.INFRASIG.CARTON</adms:schemaAgency>
+         </rdf:Description>
+      </adms:identifier>
       <dct:description xml:lang="fre">Le plan de secteur est un outil réglementaire d'aménagement du territoire et d'urbanisme
           régional wallon constitué de plusieurs couches de données spatiales.
 
@@ -424,20 +430,6 @@
           - une nouvelle zone non destinée à l'urbanisation : zone d'extraction (ZE).</dct:description>
          </dct:ProvenanceStatement>
       </dct:provenance>
-      <adms:identifier>
-         <rdf:Description>
-            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
-            <skos:notation>7fe2f305-1302-4297-b67e-792f55acd834</skos:notation>
-            <adms:schemaAgency>http://geodata.wallonie.be/id/</adms:schemaAgency>
-         </rdf:Description>
-      </adms:identifier>
-      <adms:identifier>
-         <rdf:Description>
-            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
-            <skos:notation>DGATLPE__PDS</skos:notation>
-            <adms:schemaAgency>BE.SPW.INFRASIG.CARTON</adms:schemaAgency>
-         </rdf:Description>
-      </adms:identifier>
       <dcat:theme>
          <skos:Concept rdf:about="http://publications.europa.eu/resource/authority/data-theme/AGRI">
             <skos:prefLabel xml:lang="fr">Agriculture, pêche, sylviculture et alimentation</skos:prefLabel>
diff --git a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-hvd-dataset-core.rdf b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-hvd-dataset-core.rdf
index b04f603fc13..d067b2bb4bf 100644
--- a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-hvd-dataset-core.rdf
+++ b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-hvd-dataset-core.rdf
@@ -98,7 +98,13 @@
       <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2023-02-21</dct:issued>
       <dcat:version>1.0</dcat:version>
       <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">http://geodata.wallonie.be/id/7fe2f305-1302-4297-b67e-792f55acd834</dct:identifier>
-      <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">BE.SPW.INFRASIG.CARTON/DGATLPE__PDS</dct:identifier>
+      <adms:identifier>
+         <rdf:Description>
+            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
+            <skos:notation>DGATLPE__PDS</skos:notation>
+            <adms:schemaAgency>BE.SPW.INFRASIG.CARTON</adms:schemaAgency>
+         </rdf:Description>
+      </adms:identifier>
       <dct:description xml:lang="fre">Le plan de secteur est un outil réglementaire d'aménagement du territoire et d'urbanisme
           régional wallon constitué de plusieurs couches de données spatiales.
 
@@ -433,20 +439,6 @@
           - une nouvelle zone non destinée à l'urbanisation : zone d'extraction (ZE).</dct:description>
          </dct:ProvenanceStatement>
       </dct:provenance>
-      <adms:identifier>
-         <rdf:Description>
-            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
-            <skos:notation>7fe2f305-1302-4297-b67e-792f55acd834</skos:notation>
-            <adms:schemaAgency>http://geodata.wallonie.be/id/</adms:schemaAgency>
-         </rdf:Description>
-      </adms:identifier>
-      <adms:identifier>
-         <rdf:Description>
-            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
-            <skos:notation>DGATLPE__PDS</skos:notation>
-            <adms:schemaAgency>BE.SPW.INFRASIG.CARTON</adms:schemaAgency>
-         </rdf:Description>
-      </adms:identifier>
       <dcat:theme>
          <skos:Concept rdf:about="http://publications.europa.eu/resource/authority/data-theme/AGRI">
             <skos:prefLabel xml:lang="fr">Agriculture, pêche, sylviculture et alimentation</skos:prefLabel>
diff --git a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-mobility-dataset-core.rdf b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-mobility-dataset-core.rdf
index e8f5acf2af0..22110bf0040 100644
--- a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-mobility-dataset-core.rdf
+++ b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-mobility-dataset-core.rdf
@@ -99,7 +99,13 @@
       <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2023-02-21</dct:issued>
       <dcat:version>1.0</dcat:version>
       <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">http://geodata.wallonie.be/id/7fe2f305-1302-4297-b67e-792f55acd834</dct:identifier>
-      <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">BE.SPW.INFRASIG.CARTON/DGATLPE__PDS</dct:identifier>
+      <adms:identifier>
+         <rdf:Description>
+            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
+            <skos:notation>DGATLPE__PDS</skos:notation>
+            <adms:schemaAgency>BE.SPW.INFRASIG.CARTON</adms:schemaAgency>
+         </rdf:Description>
+      </adms:identifier>
       <dct:description xml:lang="fre">Le plan de secteur est un outil réglementaire d'aménagement du territoire et d'urbanisme
           régional wallon constitué de plusieurs couches de données spatiales.
 
@@ -425,20 +431,6 @@
           - une nouvelle zone non destinée à l'urbanisation : zone d'extraction (ZE).</dct:description>
          </dct:ProvenanceStatement>
       </dct:provenance>
-      <adms:identifier>
-         <rdf:Description>
-            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
-            <skos:notation>7fe2f305-1302-4297-b67e-792f55acd834</skos:notation>
-            <adms:schemaAgency>http://geodata.wallonie.be/id/</adms:schemaAgency>
-         </rdf:Description>
-      </adms:identifier>
-      <adms:identifier>
-         <rdf:Description>
-            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
-            <skos:notation>DGATLPE__PDS</skos:notation>
-            <adms:schemaAgency>BE.SPW.INFRASIG.CARTON</adms:schemaAgency>
-         </rdf:Description>
-      </adms:identifier>
       <dcat:theme>
          <skos:Concept rdf:about="http://publications.europa.eu/resource/authority/data-theme/AGRI">
             <skos:prefLabel xml:lang="fr">Agriculture, pêche, sylviculture et alimentation</skos:prefLabel>
diff --git a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-geodcat-ap-dataset-core.rdf b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-geodcat-ap-dataset-core.rdf
index 429f3a0df93..260b3477141 100644
--- a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-geodcat-ap-dataset-core.rdf
+++ b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-geodcat-ap-dataset-core.rdf
@@ -118,7 +118,13 @@
       <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2023-02-21</dct:issued>
       <dcat:version>1.0</dcat:version>
       <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">http://geodata.wallonie.be/id/7fe2f305-1302-4297-b67e-792f55acd834</dct:identifier>
-      <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">BE.SPW.INFRASIG.CARTON/DGATLPE__PDS</dct:identifier>
+      <adms:identifier>
+         <rdf:Description>
+            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
+            <skos:notation>DGATLPE__PDS</skos:notation>
+            <adms:schemaAgency>BE.SPW.INFRASIG.CARTON</adms:schemaAgency>
+         </rdf:Description>
+      </adms:identifier>
       <dct:description xml:lang="fre">Le plan de secteur est un outil réglementaire d'aménagement du territoire et d'urbanisme
           régional wallon constitué de plusieurs couches de données spatiales.
 
@@ -425,20 +431,6 @@
           - une nouvelle zone non destinée à l'urbanisation : zone d'extraction (ZE).</dct:description>
          </dct:ProvenanceStatement>
       </dct:provenance>
-      <adms:identifier>
-         <rdf:Description>
-            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
-            <skos:notation>7fe2f305-1302-4297-b67e-792f55acd834</skos:notation>
-            <adms:schemaAgency>http://geodata.wallonie.be/id/</adms:schemaAgency>
-         </rdf:Description>
-      </adms:identifier>
-      <adms:identifier>
-         <rdf:Description>
-            <rdf:type rdf:resource="http://www.w3.org/ns/adms#Identifier"/>
-            <skos:notation>DGATLPE__PDS</skos:notation>
-            <adms:schemaAgency>BE.SPW.INFRASIG.CARTON</adms:schemaAgency>
-         </rdf:Description>
-      </adms:identifier>
       <dcat:theme>
          <skos:Concept rdf:about="http://publications.europa.eu/resource/authority/data-theme/AGRI">
             <skos:prefLabel xml:lang="fr">Agriculture, pêche, sylviculture et alimentation</skos:prefLabel>