Add dcatde:contributorID to dcat output and update namespace

GovDataOfficial · Jul 17, 2020 · 70105ce · 70105ce
1 parent 7ff7a18
commit 70105ce
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/src/main/resources/camel-oai-pmh.properties b/src/main/resources/camel-oai-pmh.properties
@@ -4,3 +4,4 @@ db.item.csw.TYPE=${db.item.csw.TYPE}
 db.item.csw.URL=${db.item.csw.URL}
 db.item.ckan.TYPE=${db.item.ckan.TYPE}
 db.item.ckan.URL=${db.item.ckan.URL}
+dcatde.contributorID=http:https://dcat-ap.de/def/contributors/gdiDE
diff --git a/src/main/resources/camel-oai-pmh.xml b/src/main/resources/camel-oai-pmh.xml
@@ -81,6 +81,9 @@
  <setHeader headerName="response_date">
  <simple>${date:now:yyyy-MM-dd'T'HH:mm:ss'Z'}</simple>
  </setHeader>
+ <setHeader headerName="contributorID">
+ <simple>{{dcatde.contributorID}}</simple>
+ </setHeader>
  <removeHeader headerName="page"/>
  <removeHeader headerName="cookie"/>
  <!-- we need some element for xsl input, but the result only depends on header (request) parameters -->
@@ -231,6 +234,9 @@
  <setHeader headerName="baseCatalogUri">
  <simple>{{rdf.catalog.base.url}}</simple>
  </setHeader>
+ <setHeader headerName="contributorID">
+ <simple>{{dcatde.contributorID}}</simple>
+ </setHeader>
  <removeHeader headerName="resumptionToken"/>
  <removeHeader headerName="cookie"/>
  <!-- we need some element for xsl input, but the result only depends on header (request) parameters -->

diff --git a/src/main/resources/dcat2iso.xsl b/src/main/resources/dcat2iso.xsl
@@ -13,7 +13,7 @@
  xmlns:rdfs="http:https://www.w3.org/2000/01/rdf-schema#"
  xmlns:srv="http:https://www.isotc211.org/2005/srv"
  xmlns:vcard="http:https://www.w3.org/2006/vcard/ns#"
- xmlns:dcatde="http:https://dcat-ap.de/def/dcatde/1_0/"
+ xmlns:dcatde="http:https://dcat-ap.de/def/dcatde/"
  exclude-result-prefixes="dcat dcatde dct foaf gml locn rdf rdfs vcard"
  expand-text="true">
  <xsl:output method="xml"/>

diff --git a/src/main/resources/iso2dcat.xsl b/src/main/resources/iso2dcat.xsl
@@ -20,7 +20,7 @@
  xmlns:xlink="http:https://www.w3.org/1999/xlink"
  xmlns:cnt="http:https://www.w3.org/2011/content#"
  xmlns:gmi="http:https://www.isotc211.org/2005/gmi"
- xmlns:dcatde="http:https://dcat-ap.de/def/dcatde/1_0/"
+ xmlns:dcatde="http:https://dcat-ap.de/def/dcatde/"
  xmlns:adms="http:https://www.w3.org/ns/adms#"
  xmlns:org="http:https://www.w3.org/ns/org#"
  xmlns:xs="http:https://www.w3.org/2001/XMLSchema"
@@ -29,16 +29,17 @@
 
  <xsl:output method="xml"/>
 
+ <!-- Parameters from route -->
+ <xsl:param name="contributorID"/>
+
  <!--
  <xsl:strip-space elements="*"/>
  -->
  <xsl:variable name="c_license">license</xsl:variable>
  <xsl:variable name="c_no_limitation">keine</xsl:variable>
  <xsl:variable name="c_other_restrictions">otherRestrictions</xsl:variable>
 
- <xsl:param name="resumptionToken">51:dcat_ap::</xsl:param>
  <xsl:variable name="tokeDcatAp">:dcat_ap:</xsl:variable>
- <xsl:param name="metadataPrefix">dcat_ap</xsl:param>
  <xsl:variable name="prefixDcatAp">dcat_ap</xsl:variable>
 
  <xsl:variable name="mdrFileTypes" select="document('filetypes-skos.rdf')"/>
@@ -87,6 +88,9 @@
  <!--dct:description-->
  <xsl:apply-templates select="gmd:identificationInfo[1]/*/gmd:abstract/gco:CharacterString[text()]"/>
 
+ <!-- dcatde:contributorID -->
+ <xsl:call-template name="contributorID"/>
+
  <!--dct:identifier-->
  <xsl:apply-templates select="gmd:fileIdentifier/gco:CharacterString"/>
 
@@ -150,6 +154,16 @@
  </dcat:Dataset>
  </xsl:template>
 
+ <xsl:template name="contributorID">
+ <xsl:if test="$contributorID">
+ <dcatde:contributorID>
+ <xsl:attribute name="rdf:resource">
+ <xsl:value-of select="$contributorID"/>
+ </xsl:attribute>
+ </dcatde:contributorID>
+ </xsl:if>
+ </xsl:template>
+
  <xsl:template match="gmd:fileIdentifier/*">
  <adms:identifier>
  <xsl:value-of select="."/>