Standard / ISO / DCAT formatters / Better handle HVD concept by norma…

…lizing long labels.
SPW-DIG · Apr 23, 2024 · aa5f3c0 · aa5f3c0
1 parent 5e9d0a8
commit aa5f3c0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/...5-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap-hvd/eu-dcat-ap-hvd-core.xsl b/...5-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap-hvd/eu-dcat-ap-hvd-core.xsl
@@ -76,8 +76,11 @@
                 match="mri:descriptiveKeywords[*/mri:thesaurusName/*/cit:title/*/@xlink:href = $hvdCategoryThesaurusKey]">
     <xsl:for-each select="*/mri:keyword[*/text() != '']">
 
+      <xsl:variable name="category"
+                    as="xs:string?"
+                    select="current()/*/text()"/>
       <xsl:variable name="hvdCategory"
-                    select="$euHvdDataCategories/rdf:RDF/rdf:Description[skos:prefLabel/text() = current()/*/text()]"/>
+                    select="$euHvdDataCategories/rdf:RDF/*[skos:prefLabel/normalize-space(.) = $category]"/>
       <xsl:if test="$hvdCategory">
         <dcatap:hvdCategory>
           <skos:Concept rdf:about="{$hvdCategory/@rdf:about}">
@@ -97,8 +100,11 @@
                 match="mri:descriptiveKeywords[*/mri:thesaurusName/*/cit:title/*/@xlink:href = $hvdApplicableLegislationThesaurusKey]">
     <xsl:for-each select="*/mri:keyword[*/text() != '']">
 
+      <xsl:variable name="legislation"
+                    as="xs:string?"
+                    select="current()/*/text()"/>
       <xsl:variable name="applicableLegislation"
-                    select="$euHvdApplicableLegislation/rdf:RDF/*[skos:prefLabel/text() = current()/*/text()]"/>
+                    select="$euHvdApplicableLegislation/rdf:RDF/*[skos:prefLabel/normalize-space() = $legislation]"/>
       <xsl:if test="$applicableLegislation">
         <dcatap:applicableLegislation rdf:resource="{$applicableLegislation/@rdf:about}">
           <!--<eli:LegalResource>

diff --git a/...est/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset-core.rdf b/...est/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset-core.rdf
@@ -296,6 +296,7 @@
       </skos:Concept>
     </dcat:theme>
     <dcat:keyword xml:lang="fre">Mobilité</dcat:keyword>
+    <dcat:keyword xml:lang="fre">Observation de la terre et environnement</dcat:keyword>
     <dcat:theme>
       <skos:Concept rdf:about="http://data.europa.eu/eli/reg/2014/1143/oj">
         <skos:prefLabel xml:lang="fre">1143/2014</skos:prefLabel>

diff --git a/...src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset.xml b/...src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset.xml
@@ -924,6 +924,9 @@
           <mri:keyword>
             <gco:CharacterString>Mobilité</gco:CharacterString>
           </mri:keyword>
+          <mri:keyword>
+            <gco:CharacterString>Observation de la terre et environnement</gco:CharacterString>
+          </mri:keyword>
           <mri:type>
             <mri:MD_KeywordTypeCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_KeywordTypeCode" codeListValue="theme"/>
           </mri:type>

diff --git a/...sources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core.rdf b/...sources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core.rdf
@@ -309,6 +309,7 @@
       </skos:Concept>
     </dcat:theme>
     <dcat:keyword xml:lang="fre">Mobilité</dcat:keyword>
+    <dcat:keyword xml:lang="fre">Observation de la terre et environnement</dcat:keyword>
     <dcat:theme>
       <skos:Concept rdf:about="http://data.europa.eu/eli/reg/2014/1143/oj">
         <skos:prefLabel xml:lang="fre">1143/2014</skos:prefLabel>

diff --git a/...ces/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-hvd-dataset-core.rdf b/...ces/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-hvd-dataset-core.rdf
@@ -313,6 +313,11 @@
         <prefLabel xmlns="http://www.w3.org/2004/02/skos/core#" xml:lang="fr">Mobilité</prefLabel>
       </skos:Concept>
     </dcatap:hvdCategory>
+    <dcatap:hvdCategory>
+      <skos:Concept rdf:about="http://data.europa.eu/bna/c_dd313021">
+        <prefLabel xmlns="http://www.w3.org/2004/02/skos/core#" xml:lang="fr">Observation de la terre et environnement</prefLabel>
+      </skos:Concept>
+    </dcatap:hvdCategory>
     <dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg/2014/1143/oj" />
     <dct:accessRights>
       <dct:RightsStatement rdf:about="http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/noLimitations" />

diff --git a/...rces/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-geodcat-ap-dataset-core.rdf b/...rces/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-geodcat-ap-dataset-core.rdf
@@ -306,6 +306,7 @@
       </skos:Concept>
     </dcat:theme>
     <dcat:keyword xml:lang="fre">Mobilité</dcat:keyword>
+    <dcat:keyword xml:lang="fre">Observation de la terre et environnement</dcat:keyword>
     <dcat:theme>
       <skos:Concept rdf:about="http://data.europa.eu/eli/reg/2014/1143/oj">
         <skos:prefLabel xml:lang="fre">1143/2014</skos:prefLabel>