From 0fbd299115aab86e5764dfc85850d76cbe1f25cb Mon Sep 17 00:00:00 2001
From: Francois Prunayre <fx.prunayre@gmail.com>
Date: Thu, 14 Dec 2023 17:07:56 +0100
Subject: [PATCH] Formatter / EU-DCAT-AP / Improve shacl validation status - 1
 format, 1 accrualPeriodicity.

---
 .../formatter/dcat/dcat-core-distribution.xsl | 56 ++++++++++++-------
 .../eu-dcat-ap/eu-dcat-ap-core-dataset.xsl    |  9 +++
 .../iso19115-3.2018-dcat-dataset-core.rdf     |  3 -
 ...so19115-3.2018-eu-dcat-ap-dataset-core.rdf |  6 --
 4 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-distribution.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-distribution.xsl
index 7413a0d4a70..5779d0764b2 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-distribution.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-distribution.xsl
@@ -265,6 +265,11 @@
             Range:	dcterms:MediaType
             Usage note:	This property to be used when the files in the distribution are packaged, e.g., in a TAR file, a ZIP file, a Frictionless Data Package or a Bagit file. The format SHOULD be expressed using a media type as defined by IANA [IANA-MEDIA-TYPES], if available.
             See also:	6.8.18 Property: compression format.
+
+            Rule:
+            * Use mimetype if any
+            * Use WWW:DOWNLOAD:(.*=format) if any
+            * fallback to ancestor::mrd:MD_DigitalTransferOptions/mrd:distributionFormat/*/mrd:formatSpecificationCitation
             -->
             <xsl:choose>
               <xsl:when test="$mimeType">
@@ -273,29 +278,22 @@
                 </xsl:call-template>
               </xsl:when>
               <xsl:otherwise>
-                <xsl:if test="starts-with($protocol, 'WWW:DOWNLOAD:')">
-                  <xsl:call-template name="rdf-format-as-mediatype">
-                    <xsl:with-param name="format" select="substring-after($protocol, 'WWW:DOWNLOAD:')"/>
-                  </xsl:call-template>
-                </xsl:if>
+                <xsl:choose>
+                  <xsl:when test="starts-with($protocol, 'WWW:DOWNLOAD:')">
+                    <xsl:call-template name="rdf-format-as-mediatype">
+                      <xsl:with-param name="format" select="substring-after($protocol, 'WWW:DOWNLOAD:')"/>
+                    </xsl:call-template>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:apply-templates mode="iso19115-3-to-dcat-distribution"
+                                         select="ancestor::mrd:MD_DigitalTransferOptions/mrd:distributionFormat/*/mrd:formatSpecificationCitation"/>
+                  </xsl:otherwise>
+                </xsl:choose>
               </xsl:otherwise>
             </xsl:choose>
 
-            <xsl:for-each select="ancestor::mrd:MD_DigitalTransferOptions/mrd:distributionFormat/*">
-              <xsl:for-each select="mrd:formatSpecificationCitation/*/cit:title/*/text()">
-                <xsl:call-template name="rdf-format-as-mediatype">
-                  <xsl:with-param name="format" select="."/>
-                </xsl:call-template>
-              </xsl:for-each>
-              <xsl:for-each select="mrd:fileDecompressionTechnique/*/text()">
-                <xsl:call-template name="rdf-format-as-mediatype">
-                  <xsl:with-param name="elementName" select="'dcat:compressFormat'"/>
-                  <xsl:with-param name="format" select="."/>
-                </xsl:call-template>
-              </xsl:for-each>
-            </xsl:for-each>
-
-
+            <xsl:apply-templates mode="iso19115-3-to-dcat-distribution"
+                                 select="ancestor::mrd:MD_DigitalTransferOptions/mrd:distributionFormat/*/mrd:fileDecompressionTechnique"/>
 
 
             <xsl:if test="$isCopyingDatasetInfoToDistribution">
@@ -370,6 +368,24 @@
     </xsl:choose>
   </xsl:template>
 
+
+  <xsl:template mode="iso19115-3-to-dcat-distribution"
+                match="mrd:distributionFormat/*/mrd:formatSpecificationCitation">
+    <xsl:call-template name="rdf-format-as-mediatype">
+      <xsl:with-param name="format" select="*/cit:title/*/text()"/>
+    </xsl:call-template>
+  </xsl:template>
+
+
+  <xsl:template mode="iso19115-3-to-dcat-distribution"
+                match="mrd:distributionFormat/*/mrd:fileDecompressionTechnique">
+    <xsl:call-template name="rdf-format-as-mediatype">
+      <xsl:with-param name="elementName" select="'dcat:compressFormat'"/>
+      <xsl:with-param name="format" select="*/text()"/>
+    </xsl:call-template>
+  </xsl:template>
+
+
   <xsl:template name="rdf-format-as-mediatype">
     <xsl:param name="elementName" as="xs:string" select="'dct:format'"/>
     <xsl:param name="format" as="xs: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 5b6b7e27041..3bd2a7e1d97 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
@@ -9,6 +9,7 @@
                 xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
                 xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0"
                 xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"
+                xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0"
                 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
                 xmlns:skos="http://www.w3.org/2004/02/skos/core#"
                 xmlns:dcat="http://www.w3.org/ns/dcat#"
@@ -217,4 +218,12 @@
       <dcat:theme rdf:resource="{.}"/>
     </xsl:for-each>
   </xsl:template>
+
+  <!--
+   sh:resultMessage              "maxCount[1]: Invalid cardinality: expected max 1: Got count = 2" ;
+   sh:resultPath                 dc:accrualPeriodicity ;
+  -->
+  <xsl:template mode="iso19115-3-to-dcat"
+                match="mdb:identificationInfo/*/mri:resourceMaintenance/*/mmi:maintenanceAndUpdateFrequency[position() > 1]"/>
+
 </xsl:stylesheet>
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 4be251ad50c..8abc45e1ad1 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
@@ -317,9 +317,6 @@
             <rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
           </dct:MediaType>
         </dct:format>
-        <dct:format>
-          <dct:MediaType rdf:about="https://publications.europa.eu/resource/authority/file-type/GPKG"/>
-        </dct:format>
         <dcat:compressFormat>
           <dct:MediaType rdf:about="https://publications.europa.eu/resource/authority/file-type/ZIP"/>
         </dcat:compressFormat>
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 89b84d919f4..c08abefba1c 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
@@ -369,9 +369,6 @@
     <dct:accrualPeriodicity>
       <dct:Frequency rdf:about="http://publications.europa.eu/resource/authority/frequency/MONTHLY"/>
     </dct:accrualPeriodicity>
-    <dct:accrualPeriodicity>
-      <dct:Frequency rdf:about="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#asNeeded"/>
-    </dct:accrualPeriodicity>
     <dcat:distribution>
       <dcat:Distribution>
         <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2023-12-08T00:00:00</dct:issued>
@@ -382,9 +379,6 @@
             <rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
           </dct:MediaType>
         </dct:format>
-        <dct:format>
-          <dct:MediaType rdf:about="https://publications.europa.eu/resource/authority/file-type/GPKG"/>
-        </dct:format>
         <dcat:compressFormat>
           <dct:MediaType rdf:about="https://publications.europa.eu/resource/authority/file-type/ZIP"/>
         </dcat:compressFormat>