From c2b455848d566eb12f815d64500cdde3c8fc35d9 Mon Sep 17 00:00:00 2001
From: Francois Prunayre <fx.prunayre@gmail.com>
Date: Thu, 21 Nov 2024 10:07:59 +0100
Subject: [PATCH] Formatters / DCAT-AP / Allow PO URI to be used for
 constraints.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In DCAT-AP, the Publication Office vocabulary is used for license and the mapping was expecting ISO to encode original URI (eg. http://creativecommons.org/licenses/by/4.0/) and not PO ones (eg. http://publications.europa.eu/resource/authority/licence/CC_BY_4_0). So ISO record using PO URI was not returning the licence in DCAT-AP (and was in DCAT - because all licence URI are allowed).

The vocabulary is encoded with the following and `skos:exactMatch` was used for the mapping:
```xml

   <skos:Concept rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"
                 at:deprecated="false">
...
      <skos:exactMatch rdf:resource="http://creativecommons.org/licenses/by/4.0/"/>
```

Adding also `rdf:about` to allow PO URI to be used in ISO record.

Eg. if
```xml
         <mri:resourceConstraints>
            <mco:MD_LegalConstraints>
               <mco:useConstraints>
                  <mco:MD_RestrictionCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_RestrictionCode"
                                          codeListValue="otherRestrictions"/>
               </mco:useConstraints>
               <mco:otherConstraints>
                  <gcx:Anchor xlink:href="http://inspire.ec.europa.eu/metadata-codelist/ConditionsApplyingToAccessAndUse/noConditionsApply">No conditions apply to access and use.</gcx:Anchor>
               </mco:otherConstraints>
            </mco:MD_LegalConstraints>
         </mri:resourceConstraints>
         <mri:resourceConstraints>
            <mco:MD_LegalConstraints>
               <mco:useConstraints>
                  <mco:MD_RestrictionCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_RestrictionCode"
                                          codeListValue="license"/>
               </mco:useConstraints>
               <mco:otherConstraints>
                  <gcx:Anchor xlink:href="http://publications.europa.eu/resource/authority/licence/BSL_1_0">BSL</gcx:Anchor>
               </mco:otherConstraints>
               <mco:otherConstraints>
                  <gcx:Anchor xlink:href="http://creativecommons.org/licenses/by/4.0/">Ces données sont disponibles sous licence CC-BY 4.0 (original).</gcx:Anchor>
               </mco:otherConstraints>
            </mco:MD_LegalConstraints>
         </mri:resourceConstraints>
```

DCAT (preserve all URI)
```xml
<dct:license>
<dct:LicenseDocument rdf:about="http://inspire.ec.europa.eu/metadata-codelist/ConditionsApplyingToAccessAndUse/noConditionsApply"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/BSL_1_0"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="http://creativecommons.org/licenses/by/4.0/"/>
```

DCAT-AP (only allow PO URI)
```xml

<dct:accessRights>
<dct:RightsStatement rdf:about="http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/noLimitations"/>
</dct:accessRights>
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/BSL_1_0"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
```
---
 .../formatter/dcat/dcat-core-access-and-use.xsl                | 2 ++
 .../records/formatters/iso19115-3.2018-dcat-dataset-core.rdf   | 3 +++
 .../api/records/formatters/iso19115-3.2018-dcat-dataset.xml    | 3 +++
 ...-dcat-ap-dataset-core-multipleAccrualPeriodicityAllowed.rdf | 3 +++
 .../formatters/iso19115-3.2018-eu-dcat-ap-dataset-core.rdf     | 3 +++
 .../formatters/iso19115-3.2018-eu-dcat-ap-hvd-dataset-core.rdf | 3 +++
 .../iso19115-3.2018-eu-dcat-ap-mobility-dataset-core.rdf       | 3 +++
 .../formatters/iso19115-3.2018-eu-geodcat-ap-dataset-core.rdf  | 3 +++
 8 files changed, 23 insertions(+)

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 d86da928861..97711a800d0 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
@@ -97,6 +97,8 @@
               <xsl:variable name="euDcatLicense"
                             select="$euLicenses/rdf:RDF/skos:Concept[
                                                   matches(skos:exactMatch/@rdf:resource,
+                                                          concat('https?://', $licenseUriWithoutHttp, '/?'))
+                                                  or matches(@rdf:about,
                                                           concat('https?://', $licenseUriWithoutHttp, '/?'))]"/>
 
               <xsl:if test="$euDcatLicense != ''">
diff --git a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset-core.rdf b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset-core.rdf
index 92696f2fcde..a8da7bc9f4d 100644
--- a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset-core.rdf
+++ b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset-core.rdf
@@ -371,6 +371,9 @@
       <dct:license>
          <dct:LicenseDocument rdf:about="https://opensource.org/licenses/CATOSL-1.1"/>
       </dct:license>
+      <dct:license>
+         <dct:LicenseDocument rdf:about="https://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
+      </dct:license>
       <dct:rights>
          <dct:RightsStatement>
             <dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>
diff --git a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset.xml b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset.xml
index c62fe2febcb..c276637c605 100644
--- a/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset.xml
+++ b/services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset.xml
@@ -1207,6 +1207,9 @@
           <mco:otherConstraints>
             <gco:CharacterString>https://opensource.org/licenses/CATOSL-1.1</gco:CharacterString>
           </mco:otherConstraints>
+          <mco:otherConstraints>
+            <gcx:Anchor xlink:href="https://publications.europa.eu/resource/authority/licence/CC_BY_4_0">Ces données sont disponibles sous licence CC-BY 4.0.</gcx:Anchor>
+          </mco:otherConstraints>
         </mco:MD_LegalConstraints>
       </mri:resourceConstraints>
       <mri:resourceConstraints>
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 680cea59e8a..b887bfdfdb8 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
@@ -374,6 +374,9 @@
     <dct:license>
       <dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CATOSL_1_1"/>
     </dct:license>
+      <dct:license>
+        <dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
+      </dct:license>
     <dct:rights>
       <dct:RightsStatement>
         <dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>
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 f6d3f12c631..1760c5d5082 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
@@ -374,6 +374,9 @@
       <dct:license>
          <dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CATOSL_1_1"/>
       </dct:license>
+       <dct:license>
+         <dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
+       </dct:license>
       <dct:rights>
          <dct:RightsStatement>
             <dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>
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 122e264643b..f7b459556b4 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
@@ -383,6 +383,9 @@
       <dct:license>
          <dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CATOSL_1_1"/>
       </dct:license>
+       <dct:license>
+         <dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
+       </dct:license>
       <dct:rights>
          <dct:RightsStatement>
             <dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>
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 8aab00adcb8..16c082020a6 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
@@ -375,6 +375,9 @@
       <dct:license>
          <dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CATOSL_1_1"/>
       </dct:license>
+       <dct:license>
+         <dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
+       </dct:license>
       <dct:rights>
          <dct:RightsStatement>
             <dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>
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 2d8e2baf0ad..4df895d7993 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
@@ -375,6 +375,9 @@
       <dct:license>
          <dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CATOSL_1_1"/>
       </dct:license>
+       <dct:license>
+         <dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
+       </dct:license>
       <dct:rights>
          <dct:RightsStatement>
             <dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>