From a9d66228913162db6f187b41a21f7635c18f8df2 Mon Sep 17 00:00:00 2001
From: MajoBerger <88670521+MajoBerger@users.noreply.github.com>
Date: Mon, 13 May 2024 07:16:18 +0200
Subject: [PATCH] fix problems displaying oai in various formats (#653)

fixed wrong number of parameters expected in java code
and wrong number of parameters sent in xsl file
---
 .../resources/functions/StringXSLFunction.java   |  2 +-
 .../oai/metadataFormats/metasharev2.xsl          | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/functions/StringXSLFunction.java b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/functions/StringXSLFunction.java
index b472c485abbd..de9a31133855 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/functions/StringXSLFunction.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/functions/StringXSLFunction.java
@@ -55,7 +55,7 @@ final public SequenceType getResultType() {
     final public SequenceType[] getArgumentTypes() {
         return new SequenceType[]{
                 SequenceType.makeSequenceType(
-                        ItemType.STRING, OccurrenceIndicator.ONE)};
+                        ItemType.STRING, OccurrenceIndicator.ZERO_OR_MORE)};
     }
 
     @Override
diff --git a/dspace/config/crosswalks/oai/metadataFormats/metasharev2.xsl b/dspace/config/crosswalks/oai/metadataFormats/metasharev2.xsl
index cf43751882d8..e716844112e6 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/metasharev2.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/metasharev2.xsl
@@ -139,7 +139,7 @@
 				</xsl:when>
                 <xsl:when
                     test="doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value']">
-                    <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value'], ';')[2]"/>
+                    <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value'][1], ';')[2]"/>
                 </xsl:when>
 				<xsl:otherwise>
 					<xsl:value-of select="fn:logMissing('surname',$handle)" />
@@ -155,7 +155,7 @@
                 </xsl:when>
                 <xsl:when
                     test="doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value']">
-                    <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value'], ';')[1]"/>
+                    <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value'][1], ';')[1]"/>
                 </xsl:when>
                 <xsl:otherwise>
                     <xsl:value-of select="fn:logMissing('givenName',$handle)" />
@@ -178,7 +178,7 @@
                 test="doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value']">
 				<ms:affiliation>
 				    <ms:organizationName>
-					   <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value'], ';')[4]" />
+					   <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value'][1], ';')[4]" />
 					</ms:organizationName>
 					<!--another communicationInfo needed -->
 					<xsl:call-template name="CommunicationInfo" />
@@ -199,7 +199,7 @@
                         </xsl:when>
                         <xsl:when
                             test="doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value']">
-                            <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value'], ';')[3]"/>
+                            <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='contact']/doc:element[@name='person']/doc:element/doc:field[@name='value'][1], ';')[3]"/>
                         </xsl:when>
                         <xsl:otherwise>
                             <xsl:value-of select="fn:logMissing('email',$handle)" />
@@ -251,7 +251,7 @@
             <xsl:when test="$fundingProjectNameCount = $fundingTypeCount  and $fundingProjectNameCount &gt; 0">
                 <ms:resourceCreationInfo>
                         <xsl:choose>
-                            <xsl:when test="not(starts-with(doc:metadata/doc:element[@name='metashare']/doc:element[@name='ResourceInfo#ResourceCreationInfo#FundingInfo#ProjectInfo']/doc:element[@name='projectName']/doc:element/doc:field[@name='value'],'#'))">
+                            <xsl:when test="not(starts-with(doc:metadata/doc:element[@name='metashare']/doc:element[@name='ResourceInfo#ResourceCreationInfo#FundingInfo#ProjectInfo']/doc:element[@name='projectName']/doc:element/doc:field[@name='value'][1],'#'))">
                                 <ms:fundingProject>
                                     <ms:projectName>
                                         <xsl:value-of select="doc:metadata/doc:element[@name='metashare']/doc:element[@name='ResourceInfo#ResourceCreationInfo#FundingInfo#ProjectInfo']/doc:element[@name='projectName']/doc:element/doc:field[@name='value']"/>
@@ -270,7 +270,7 @@
                                         <ms:projectName>
                                             <xsl:value-of select="$projectName" />
                                         </ms:projectName>
-                                            <xsl:variable name="funding" select="substring-after(/doc:metadata/doc:element[@name='metashare']/doc:element[@name='ResourceInfo#ResourceCreationInfo#FundingInfo#ProjectInfo']/doc:element[@name='fundingType']/doc:element/doc:field[@name='value'][starts-with(.,$compId)],'-')"/>
+                                            <xsl:variable name="funding" select="substring-after(/doc:metadata/doc:element[@name='metashare']/doc:element[@name='ResourceInfo#ResourceCreationInfo#FundingInfo#ProjectInfo']/doc:element[@name='fundingType']/doc:element/doc:field[@name='value'][starts-with(.,$compId)][1],'-')"/>
                                             <xsl:call-template name="FundingType">
                                                 <xsl:with-param name="funding" select="$funding"/>
                                             </xsl:call-template>
@@ -456,7 +456,7 @@
 					</xsl:when>
                     <xsl:when
                         test="doc:metadata/doc:element[@name='local']/doc:element[@name='size']/doc:element[@name='info']/doc:element/doc:field[@name='value']">
-                        <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='size']/doc:element[@name='info']/doc:element/doc:field[@name='value'], ';')[1]"/>
+                        <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='size']/doc:element[@name='info']/doc:element/doc:field[@name='value'][1], ';')[1]"/>
                     </xsl:when>
 					<xsl:otherwise>
                         			<xsl:variable name="iJustWantToLog" select="fn:logMissing('size',$handle)" />
@@ -473,7 +473,7 @@
 					</xsl:when>
                     <xsl:when
                         test="doc:metadata/doc:element[@name='local']/doc:element[@name='size']/doc:element[@name='info']/doc:element/doc:field[@name='value']">
-                        <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='size']/doc:element[@name='info']/doc:element/doc:field[@name='value'], ';')[2]"/>
+                        <xsl:value-of select="tokenize(doc:metadata/doc:element[@name='local']/doc:element[@name='size']/doc:element[@name='info']/doc:element/doc:field[@name='value'][1], ';')[2]"/>
                     </xsl:when>
 					<xsl:otherwise>
                         			<xsl:variable name="iJustWantToLog" select="fn:logMissing('size',$handle)" />