From 5837b87791f3f0c4a7a706941e1af2389b39c9d4 Mon Sep 17 00:00:00 2001
From: Arno Kaimbacher <arno.kaimbacher@geologie.ac.at>
Date: Thu, 2 Apr 2020 21:19:38 +0200
Subject: [PATCH] - adjustments in xslts for oai_dc and oai_datacite

---
 public/datasetxml2oai-pmh.xslt    | 48 +++++++++++++++++++------------
 public/prefixes/oai_datacite.xslt |  9 ++++++
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/public/datasetxml2oai-pmh.xslt b/public/datasetxml2oai-pmh.xslt
index 088deb5..d05651b 100644
--- a/public/datasetxml2oai-pmh.xslt
+++ b/public/datasetxml2oai-pmh.xslt
@@ -262,8 +262,8 @@
         <xsl:value-of select="@Id" />
       </identifier>
       <datestamp>
-         <xsl:choose>
-          <xsl:when test="ServerDateModified">            
+        <xsl:choose>
+          <xsl:when test="ServerDateModified">
             <xsl:variable name="dateModified" select="concat(
             ServerDateModified/@Year, '-',
             format-number(ServerDateModified/@Month,'00'), '-',
@@ -274,8 +274,8 @@
             )" />
             <xsl:value-of select="$dateModified" />
           </xsl:when>
-          <xsl:otherwise>           
-             <xsl:variable name="datePublished" select="concat(
+          <xsl:otherwise>
+            <xsl:variable name="datePublished" select="concat(
             ServerDatePublished/@Year, '-',
             format-number(ServerDatePublished/@Month,'00'), '-',
             format-number(ServerDatePublished/@Day,'00'), 'T',
@@ -283,7 +283,7 @@
             format-number(ServerDatePublished/@Minute,'00'), ':',
             format-number(ServerDatePublished/@Second,'00'), 'Z'
             )" />
-            <xsl:value-of select="$datePublished" />          
+            <xsl:value-of select="$datePublished" />
           </xsl:otherwise>
         </xsl:choose>
       </datestamp>
@@ -325,12 +325,6 @@
       <xsl:apply-templates select="TitleMain" mode="oai_dc" />
       <!-- dc:title -->
       <xsl:apply-templates select="TitleAdditional" mode="oai_dc" />
-      <!-- dc:description -->
-      <xsl:apply-templates select="TitleAbstract" mode="oai_dc" />
-      <!-- dc:description -->
-      <xsl:apply-templates select="TitleAbstractAdditional" mode="oai_dc" />
-      <!-- dc:subject -->
-      <xsl:apply-templates select="Subject" mode="oai_dc" />
       <!--<dc:creator>-->
       <!-- Creator: Autor (falls vorhanden), sonst Herausgeber (falls vorhanden), sonst Urhebende Koerperschaft  -->
       <xsl:choose>
@@ -343,6 +337,18 @@
           </dc:creator>
         </xsl:when>
       </xsl:choose>
+      <!-- dc:subject -->
+      <xsl:apply-templates select="Subject" mode="oai_dc" />
+      <!-- dc:description -->
+      <xsl:apply-templates select="TitleAbstract" mode="oai_dc" />
+      <!-- dc:description -->
+      <xsl:apply-templates select="TitleAbstractAdditional" mode="oai_dc" />
+      <!-- dc:publisher -->
+      <dc:publisher>
+        <!-- <xsl:value-of select="@PublisherName" /> -->
+        <xsl:value-of select="@CreatingCorporation" />
+      </dc:publisher>
+
       <!-- dc:contributor -->
       <xsl:apply-templates select="PersonContributor" mode="oai_dc" />
       <!-- dc:date (call-template, weil die 'Funktion' nur einmal aufgerufen werden soll, nicht einmal für jedes Date-->
@@ -351,22 +357,26 @@
       <xsl:apply-templates select="EmbargoDate" mode="oai_dc" />
       <!-- dc:type -->
       <!-- <xsl:apply-templates select="@Type" mode="oai_dc" /> -->
-       <dc:type>Dataset</dc:type>
+      <dc:type>Dataset</dc:type>
       <!-- dc:format -->
       <xsl:apply-templates select="File/@MimeType" mode="oai_dc" />
+      <!-- <dc:format> -->
+      <xsl:apply-templates select="File" mode="oai_dc" />
       <!-- dc:identifier -->
       <dc:identifier>
         <xsl:value-of select="@landingpage"/>
       </dc:identifier>
-      <xsl:apply-templates select="File" mode="oai_dc" />
       <!-- dc:language -->
       <xsl:apply-templates select="@Language" mode="oai_dc" />
-      <!-- dc:rights -->
-      <xsl:apply-templates select="Licence" mode="oai_dc" />
       <!-- dc:relation -->
       <xsl:apply-templates select="Reference" mode="oai_dc" />
       <!-- dc:coverage -->
       <xsl:apply-templates select="Coverage" mode="oai_dc" />
+      <!-- dc:rights -->
+      <xsl:apply-templates select="Licence" mode="oai_dc" />
+      <xsl:if test="EmbargoDate">
+        <dc:rights>embargo</dc:rights>
+      </xsl:if>
     </oai_dc:dc>
   </xsl:template>
 
@@ -489,15 +499,15 @@
     <dc:date>
       <xsl:choose>
         <xsl:when test="PublishedDate">
-         <xsl:variable name="publishedDate" select="concat(
+          <xsl:variable name="publishedDate" select="concat(
                     PublishedDate/@Year, '-',
                     format-number(PublishedDate/@Month,'00'), '-',
                     format-number(PublishedDate/@Day,'00')        
                 )" />
-         <xsl:value-of select="$publishedDate" />
-        </xsl:when>       
+          <xsl:value-of select="$publishedDate" />
+        </xsl:when>
         <xsl:otherwise>
-         <xsl:variable name="serverDatePublished" select="concat(
+          <xsl:variable name="serverDatePublished" select="concat(
                     ServerDatePublished/@Year, '-',
                     format-number(ServerDatePublished/@Month,'00'), '-',
                     format-number(ServerDatePublished/@Day,'00')        
diff --git a/public/prefixes/oai_datacite.xslt b/public/prefixes/oai_datacite.xslt
index 7de45fa..71c7e4a 100644
--- a/public/prefixes/oai_datacite.xslt
+++ b/public/prefixes/oai_datacite.xslt
@@ -304,6 +304,15 @@
                     <xsl:value-of select="@LinkLicence" />
                 </xsl:attribute>
             </xsl:if>
+            <xsl:attribute name="schemeURI">
+                <xsl:text>https://spdx.org/licenses/</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="rightsIdentifierScheme">
+                <xsl:text>SPDX</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="rightsIdentifier">
+                <xsl:text>CC-BY-NC-ND-4.0</xsl:text>
+            </xsl:attribute>
             <xsl:value-of select="@NameLong" />
         </rights>
     </xsl:template>