From 672a07ebda9a757a68a22a078bc842693f9ab6a0 Mon Sep 17 00:00:00 2001
From: Andrea Schweer <schweer@waikato.ac.nz>
Date: Wed, 6 Nov 2013 11:27:29 +1300
Subject: [PATCH] DS-992 Specify encoding scheme for URL encode (XMLUI)

---
 .../themes/dri2xhtml-alt/aspect/artifactbrowser/COinS.xsl   | 4 ++--
 .../src/main/webapp/themes/dri2xhtml/DIM-Handler.xsl        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/COinS.xsl b/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/COinS.xsl
index cd20fd19cf..13b8f3aafe 100644
--- a/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/COinS.xsl
+++ b/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/COinS.xsl
@@ -65,12 +65,12 @@
        <xsl:text>ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Adc&amp;</xsl:text>
        <xsl:for-each select=".//dim:field[@element = 'identifier']">
             <xsl:text>rft_id=</xsl:text>
-            <xsl:value-of select="encoder:encode(string(.))"/>
+            <xsl:value-of select="encoder:encode(string(.), 'UTF-8')"/>
             <xsl:text>&amp;</xsl:text>
         </xsl:for-each>
         <xsl:text>rfr_id=info%3Asid%2Fdspace.org%3Arepository&amp;</xsl:text>
         <xsl:for-each select=".//dim:field[@element != 'description' and @mdschema !='dc' and @qualifier != 'provenance']">
-            <xsl:value-of select="concat('rft.', @element,'=',encoder:encode(string(.))) "/>
+            <xsl:value-of select="concat('rft.', @element,'=',encoder:encode(string(.), 'UTF-8')) "/>
             <xsl:if test="position()!=last()">
                 <xsl:text>&amp;</xsl:text>
             </xsl:if>
diff --git a/dspace-xmlui/src/main/webapp/themes/dri2xhtml/DIM-Handler.xsl b/dspace-xmlui/src/main/webapp/themes/dri2xhtml/DIM-Handler.xsl
index bd50386532..4d31d53832 100644
--- a/dspace-xmlui/src/main/webapp/themes/dri2xhtml/DIM-Handler.xsl
+++ b/dspace-xmlui/src/main/webapp/themes/dri2xhtml/DIM-Handler.xsl
@@ -1006,7 +1006,7 @@
        <xsl:text>ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Adc&amp;</xsl:text>
        <xsl:for-each select=".//dim:field[@element = 'identifier']">
             <xsl:text>rft_id=</xsl:text>
-            <xsl:value-of select="encoder:encode(string(.))"/>
+            <xsl:value-of select="encoder:encode(string(.), 'UTF-8')"/>
             <xsl:text>&amp;</xsl:text>
         </xsl:for-each>
         <xsl:text>rfr_id=info%3Asid%2Fdspace.org%3Arepository&amp;</xsl:text>
@@ -1017,10 +1017,10 @@
             
             <xsl:choose>
             <xsl:when test="@element = 'contributor' and @qualifier='author'">
-                <xsl:value-of select="concat('rft.', 'creator','=',encoder:encode(string(.))) "/>
+                <xsl:value-of select="concat('rft.', 'creator','=',encoder:encode(string(.), 'UTF-8')) "/>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:value-of select="concat('rft.', @element,'=',encoder:encode(string(.))) "/>
+                <xsl:value-of select="concat('rft.', @element,'=',encoder:encode(string(.), 'UTF-8')) "/>
             </xsl:otherwise>
             </xsl:choose>