MIR-1260 Removed parameter 'returnId' as it is not needed anymore

MyCoRe-Org · Feb 23, 2024 · 2c67902 · 2c67902
1 parent a1042cf
commit 2c67902
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/mir-module/src/main/resources/config/mir/mycore.properties b/mir-module/src/main/resources/config/mir/mycore.properties
@@ -56,6 +56,9 @@ MCR.URIResolver.xslIncludes.xeditorTemplates=solr-xeditor-templates.xsl
 #required for mycore-mods
 MCR.URIResolver.xslImports.solr-document=%MCR.URIResolver.xslImports.solr-document%,mods-solr.xsl
 
+#required for mycore-iview2
+MCR.URIResolver.xslImports.solr-document=%MCR.URIResolver.xslImports.solr-document%,iview2-solr.xsl
+
 ##############################################################################
 # Configure ACL Checking                                                     #
 ##############################################################################

diff --git a/mir-module/src/main/resources/xsl/mir-utils.xsl b/mir-module/src/main/resources/xsl/mir-utils.xsl
@@ -31,7 +31,6 @@
         <xsl:param name="baseURL"/>
         <xsl:param name="mimeType"/>
         <xsl:param name="derivateMaindoc"/>
-        <xsl:param name="returnId"/>
 
         <xsl:choose>
             <xsl:when test="$mimeType='application/pdf' or
@@ -103,7 +102,7 @@
             </xsl:when>
             <xsl:otherwise>
                 <xsl:choose>
-                    <xsl:when test="string-length($derivateMaindoc) &gt; 0 and string-length($returnId) &gt; 0">
+                    <xsl:when test="string-length($derivateMaindoc) &gt; 0">
                       <xsl:variable name="ext"
                                     select="document(concat('callJava:org.apache.commons.io.FilenameUtils:getExtension:', $derivateMaindoc))"/>
                       <xsl:value-of

diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl
@@ -518,7 +518,6 @@
                       <xsl:with-param name="baseURL" select="$WebApplicationBaseURL"/>
                       <xsl:with-param name="mimeType" select="$contentType"/>
                       <xsl:with-param name="derivateMaindoc" select="$displayDerivate/str[@name='derivateMaindoc']"/>
-                      <xsl:with-param name="returnId" select="$displayDerivate/str[@name='returnId']"/>
                     </xsl:call-template>
                   </xsl:variable>
                   <img class="hit_icon_overlay" src="{$iconLink}"/>