Formatter / EU-DCAT-AP-HVD / Add Shacl validation - which is failing …

…for now.

schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-distribution.xsl

@@ -101,7 +101,11 @@
   Range:	dcat:Distribution
   -->
   <xsl:template mode="iso19115-3-to-dcat"
+                name="iso19115-3-to-dcat-distribution"
                 match="mdb:distributionInfo//mrd:onLine">
+    <xsl:param name="additionalProperties"
+               as="node()*"/>
+
     <xsl:variable name="url"
                   select="*/cit:linkage/gco:CharacterString/text()"/>
 
@@ -361,6 +365,8 @@
               <xsl:apply-templates mode="iso19115-3-to-dcat"
                                    select="ancestor::mdb:MD_Metadata/mdb:dataQualityInfo/*/mdq:report/*/mdq:result[mdq:DQ_ConformanceResult and mdq:DQ_ConformanceResult/mdq:pass/*/text() = 'true']"/>
             </xsl:if>
+
+            <xsl:copy-of select="$additionalProperties"/>
           </dcat:Distribution>
         </dcat:distribution>
       </xsl:otherwise>

schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap-hvd/eu-dcat-ap-hvd-core.xsl

@@ -5,9 +5,12 @@
                 xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
                 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:mco="http://standards.iso.org/iso/19115/-3/mco/1.0"
+                xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/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:dcatap="http://data.europa.eu/r5r/"
+                xmlns:eli="http://data.europa.eu/eli/ontology"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns:dct="http://purl.org/dc/terms/"
                 exclude-result-prefixes="#all">
@@ -20,19 +23,24 @@
                 select="document('vocabularies/high-value-dataset-category.rdf')"/>
 
 
+  <xsl:template mode="iso19115-3-to-dcat-resource"
+                match="mdb:MD_Metadata">
+    <xsl:call-template name="iso19115-3-to-dcat-resource"/>
+
+    <xsl:apply-templates mode="iso19115-3-to-dcat"
+                         select="mdb:identificationInfo/*/mri:resourceConstraints/mco:MD_LegalConstraints/mco:reference"/>
+  </xsl:template>
+
+
   <!--
   Dataset
 
-  applicable legislation	Legal Resource	1..*	The legislation that mandates the creation or management of the Dataset.	For HVD the value must include the ELI http://data.europa.eu/eli/reg_impl/2023/138/oj.
-  As multiple legislations may apply to the resource the maximum cardinality is not limited.		P
   conforms to	Standard	0..*	An implementing rule or other specification.	The provided information should enable to the verification whether the detailed information requirements by the HVD is satisfied. For more usage suggestions see section on specific data requirements.	Link	A
   contact point	Kind	0..*	Contact information that can be used for sending comments about the Dataset.		Link	A
   dataset distribution	Distribution	1..*	An available Distribution for the Dataset.	The HVD IR is a quality improvement of existing datasets. The intention is that HVD datasets are publicly and open accessible. Therefore a Distribution is expected to be present. (Article 3.1)	Link	A
 
   DataService
 
-  applicable legislation	Legal Resource	1..*	The legislation that mandates the creation or management of the Data Service.	For HVD the value MUST include the ELI http://data.europa.eu/eli/reg_impl/2023/138/oj.
-  As multiple legislations may apply to the resource the maximum cardinality is not limited.		P
   contact point	Kind	1..*	Contact information that can be used for sending comments about the Data Service.	Article 3.4 requires the designation of a point of contact for an API.	Link	P
   documentation	Document	1..*	A page that provides additional information about the Data Service.	Quality of service covers a broad spectrum of aspects. The HVD regulation does not list any mandatory topic. Therefore quality of service information is considered part of the generic documentation of a Data Service.		P
   endpoint description	Resource	0..*	A description of the services available via the end-points, including their operations, parameters etc.	The property gives specific details of the actual endpoint instances, while dct:conformsTo is used to indicate the general standard or specification that the endpoints implement.
@@ -73,4 +81,37 @@
       </xsl:if>
     </xsl:for-each>
   </xsl:template>
+
+
+  <!--
+  applicable legislation	Legal Resource	1..*	The legislation that mandates the creation or management of the Data Service.	For HVD the value MUST include the ELI http://data.europa.eu/eli/reg_impl/2023/138/oj.
+  As multiple legislations may apply to the resource the maximum cardinality is not limited.		P
+  -->
+  <xsl:template mode="iso19115-3-to-dcat"
+                match="mri:resourceConstraints/mco:MD_LegalConstraints/mco:reference">
+    <xsl:variable name="href"
+                  select="*/cit:title/*/@xlink:href"/>
+    <xsl:if test="$href">
+      <dcatap:applicableLegislation rdf:resource="{$href}">
+        <!--<eli:LegalResource>
+          <xsl:for-each select="*/cit:title">
+            <xsl:call-template name="rdf-localised">
+              <xsl:with-param name="nodeName" select="'dct:title'"/>
+            </xsl:call-template>
+          </xsl:for-each>
+        </eli:LegalResource>-->
+      </dcatap:applicableLegislation>
+    </xsl:if>
+  </xsl:template>
+
+
+  <xsl:template mode="iso19115-3-to-dcat"
+                match="mdb:distributionInfo//mrd:onLine">
+    <xsl:call-template name="iso19115-3-to-dcat-distribution">
+      <xsl:with-param name="additionalProperties">
+        <xsl:apply-templates mode="iso19115-3-to-dcat"
+                             select="ancestor::mdb:MD_Metadata/mdb:identificationInfo/*/mri:resourceConstraints/mco:MD_LegalConstraints/mco:reference"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
 </xsl:stylesheet>

schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl

@@ -27,6 +27,7 @@
   <xsl:template name="create-namespaces-eu-dcat-ap">
     <xsl:call-template name="create-namespaces"/>
     <xsl:namespace name="dcatap" select="'http://data.europa.eu/r5r/'"/>
+    <xsl:namespace name="eli" select="'http://data.europa.eu/eli/ontology'"/>
   </xsl:template>
 
   <!--

services/src/test/java/org/fao/geonet/api/records/formatters/FormatterApiTest.java

@@ -84,6 +84,7 @@ public static Collection<String[]> data() throws Exception {
 
         data.add(new String[]{"iso19115-3.2018-dcat-dataset.xml", "dcat", "", "iso19115-3.2018", "dataset-core.rdf"});
         data.add(new String[]{"iso19115-3.2018-dcat-dataset.xml", "eu-dcat-ap", "", "iso19115-3.2018", "dataset-core.rdf"});
+        data.add(new String[]{"iso19115-3.2018-dcat-dataset.xml", "eu-dcat-ap-hvd", "", "iso19115-3.2018", "dataset-core.rdf"});
         data.add(new String[]{"iso19115-3.2018-dcat-service.xml", "dcat", "", "iso19115-3.2018", "service-core.rdf"});
 
         return data;
@@ -153,10 +154,13 @@ public void checkFormatter() throws Exception {
                             fail(String.format("%s. Checked with %s. RDF model error. %s. Checked with: %s",
                                 url, checkfile, rdfException.getMessage(), actual));
                         }
-                    }
-
-                    if("eu-dcat-ap".equalsIgnoreCase(formatter)){
-                        String[] shaclValidation = {"dcat-ap-2.1.1-base-SHACL.ttl", "dcat-ap-3-SHACL.ttl"};
+                        String[] shaclValidation = {};
+                        if("eu-dcat-ap".equalsIgnoreCase(formatter)){
+                            shaclValidation = new String[]{"dcat-ap-2.1.1-base-SHACL.ttl"};
+// TODO                       shaclValidation = new String[]{"dcat-ap-2.1.1-base-SHACL.ttl", "dcat-ap-3-SHACL.ttl"};
+                        } else  if("eu-dcat-ap-hvd".equalsIgnoreCase(formatter)){
+                            shaclValidation = new String[]{"dcat-ap-hvd-2.2.0-SHACL.ttl"};
+                        }
                         for(String shaclShapes : shaclValidation) {
                             applyShaclValidation(formatter, schema, checkfile, url, shaclShapes);
                         }
@@ -169,7 +173,7 @@ public void checkFormatter() throws Exception {
                     );
                 }
             } catch (Exception e) {
-                fail(url);
+                fail(String.format("Failure on %s. Error is: %s", url, e.getMessage()));
             }
         }
     }
@@ -194,12 +198,16 @@ private static void applyShaclValidation(String formatter, String schema, String
 
         ValidationReport report = ShaclValidator.get().validate(shapes, dataGraph);
 
-        if(report.conforms() == false){
+        if(!report.conforms()){
+            long count = report.getEntries().stream()
+                .filter(e -> e.severity().level().getURI().equals("http://www.w3.org/ns/shacl#Violation"))
+                .count();
+
             ShLib.printReport(report);
             System.out.println();
             RDFDataMgr.write(System.out, report.getModel(), Lang.TTL);
-            fail(String.format("%s. Checked with %s [%s]. Invalid DCAT-AP document. See report in the test console output.",
-                url, checkfile, shaclShapes));
+            fail(String.format("%s. Checked with %s [%s]. Invalid DCAT-AP document. %d violations found. See report in the test console output.",
+                url, checkfile, shaclShapes, count));
         }
     }