From 70105ce8c56e23887bc60c96c6e9d1a526c6e022 Mon Sep 17 00:00:00 2001
From: seitenbau-govdata <govdata@seitenbau.com>
Date: Wed, 13 May 2020 17:50:32 +0200
Subject: [PATCH] Add dcatde:contributorID to dcat output and update namespace

---
 src/main/resources/camel-oai-pmh.properties |  1 +
 src/main/resources/camel-oai-pmh.xml        |  6 ++++++
 src/main/resources/dcat2iso.xsl             |  2 +-
 src/main/resources/iso2dcat.xsl             | 20 +++++++++++++++++---
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/camel-oai-pmh.properties b/src/main/resources/camel-oai-pmh.properties
index a415ea8..20ba356 100644
--- 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://dcat-ap.de/def/contributors/gdiDE
diff --git a/src/main/resources/camel-oai-pmh.xml b/src/main/resources/camel-oai-pmh.xml
index 48e804c..1b280ef 100644
--- 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
index 02f2816..9f3ce9b 100644
--- a/src/main/resources/dcat2iso.xsl
+++ b/src/main/resources/dcat2iso.xsl
@@ -13,7 +13,7 @@
                 xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
                 xmlns:srv="http://www.isotc211.org/2005/srv"
                 xmlns:vcard="http://www.w3.org/2006/vcard/ns#"
-                xmlns:dcatde="http://dcat-ap.de/def/dcatde/1_0/"
+                xmlns:dcatde="http://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
index a99288d..faeadb6 100644
--- a/src/main/resources/iso2dcat.xsl
+++ b/src/main/resources/iso2dcat.xsl
@@ -20,7 +20,7 @@
                 xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns:cnt="http://www.w3.org/2011/content#"
                 xmlns:gmi="http://www.isotc211.org/2005/gmi"
-                xmlns:dcatde="http://dcat-ap.de/def/dcatde/1_0/"
+                xmlns:dcatde="http://dcat-ap.de/def/dcatde/"
                 xmlns:adms="http://www.w3.org/ns/adms#"
                 xmlns:org="http://www.w3.org/ns/org#"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -29,6 +29,9 @@
 
     <xsl:output method="xml"/>
 
+    <!-- Parameters from route -->
+    <xsl:param name="contributorID"/>
+
     <!--
     <xsl:strip-space elements="*"/>
     -->
@@ -36,9 +39,7 @@
     <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="."/>