EASY-2674: Creators can be funders too ... (#33)

DANS-KNAW · Apr 6, 2020 · bee7e95 · bee7e95
1 parent dc7abdc
commit bee7e95
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/resources/xslt-files/EMD_doi_datacite_v4.1.xsl b/src/main/resources/xslt-files/EMD_doi_datacite_v4.1.xsl
@@ -132,7 +132,7 @@
     <!-- ==================================================== -->
     <xsl:template match="emd:creator">
         <xsl:element name="creators">
-            <xsl:apply-templates select="eas:creator">
+            <xsl:apply-templates select="eas:creator[not(eas:role='Funder')]">
                 <xsl:with-param name="authortype">creator</xsl:with-param>
             </xsl:apply-templates>
             <xsl:apply-templates select="dc:creator"/>
@@ -155,7 +155,7 @@
     <!-- eas:creator/eas:contributor to datacite creator/contributor -->
     <!-- ==================================================== -->
     <xsl:template match="eas:creator[eas:role='Funder'] | eas:contributor[eas:role='Funder']">
-        <xsl:element name="fundingReferences">
+
             <xsl:element name="fundingReference">
                 <xsl:element name="funderName">
                     <xsl:choose>
@@ -176,7 +176,7 @@
                     </xsl:element>
                 </xsl:for-each>
             </xsl:element>
-        </xsl:element>
+
     </xsl:template>
     <xsl:template match="eas:creator | eas:contributor">
         <xsl:param name="authortype"/>
@@ -250,7 +250,10 @@
     <!-- funding contributor to datacite fundingReference -->
     <!-- ==================================================== -->
     <xsl:template name="funder">
-        <xsl:apply-templates select="emd:contributor/eas:contributor[eas:role='Funder']"/>
+        <xsl:element name="fundingReferences">
+            <xsl:apply-templates select="emd:contributor/eas:contributor[eas:role='Funder']"/>
+            <xsl:apply-templates select="emd:creator/eas:creator[eas:role='Funder']"/>
+        </xsl:element>
     </xsl:template>
 
     <!-- ==================================================== -->