DCAT formatter improvements: (#8836)

- Data services doesn't have distributions

Author: josegar74

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

@@ -14,6 +14,7 @@
                 xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0"
                 xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/2.0"
                 xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"
+                xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
                 xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
@@ -147,6 +148,9 @@
     <!-- TODO: SEMICeu check if GetCapabilities in URL. Could check for protocols ?-->
     <xsl:variable name="pointsToService" select="false()"/>
 
+    <xsl:variable name="isServiceMetadata"
+                  select="exists(//mdb:MD_Metadata/mdb:identificationInfo/srv:SV_ServiceIdentification)" />
+
     <xsl:choose>
       <xsl:when test="normalize-space($url) = ''"/>
       <!--
@@ -176,6 +180,9 @@
           </foaf:Document>
         </foaf:page>
       </xsl:when>
+      <xsl:when test="$isServiceMetadata">
+        <!-- Don't add distribution for service metadata -->
+      </xsl:when>
       <xsl:otherwise>
         <dcat:distribution>
           <dcat:Distribution>

services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-service-core.rdf

@@ -341,31 +341,6 @@
             </dct:description>
          </foaf:Document>
       </foaf:page>
-      <dcat:distribution>
-         <dcat:Distribution>
-            <dct:title xml:lang="fr">INSPIRE Sites Protégés - Service de téléchargement
-
-                </dct:title>
-            <dct:description xml:lang="fr">Adresse de connexion au service de téléchargement ATOM Feed des couches de données
-                  du thème "Sites protégés".
-
-                </dct:description>
-              <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2017-11-15</dct:issued>
-
-
-
-            <dcat:accessURL rdf:resource="https://geoservices.wallonie.be/inspire/atom/PS_Service.xml"/>
-            <dcat:accessService>
-               <rdf:Description>
-                  <rdf:type rdf:resource="http://www.w3.org/ns/dcat#DataService"/>
-                  <dct:title xml:lang="fr">INSPIRE Sites Protégés - Service de téléchargement
-
-                </dct:title>
-                  <dcat:endpointURL rdf:resource="https://geoservices.wallonie.be/inspire/atom/PS_Service.xml"/>
-               </rdf:Description>
-            </dcat:accessService>
-         </dcat:Distribution>
-      </dcat:distribution>
       <foaf:documentation>
          <foaf:Document rdf:about="https://directory.spatineo.com/service/164564">
             <dct:title xml:lang="fr">Statistiques de disponibilité WMS</dct:title>