#8 adopted to changes in mycore

MyCoRe-Org · Aug 8, 2023 · a4bb04a · a4bb04a
1 parent 92dd0f4
commit a4bb04a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.../__rootArtifactId__-module/src/main/resources/config/__rootArtifactId__/mycore.properties b/.../__rootArtifactId__-module/src/main/resources/config/__rootArtifactId__/mycore.properties
@@ -56,7 +56,8 @@ MCR.ContentTransformer.users-subselect.Stylesheet=xsl/users-subselect-3.xsl,%MCR
 MCR.ContentTransformer.users.Stylesheet=xsl/users-3.xsl,%MCR.LayoutTransformerFactory.Default.Stylesheets%
 
 MCR.ContentTransformer.response.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
-MCR.ContentTransformer.response.Stylesheet=%MCR.ContentTransformer.response-prepared-3.Stylesheet%,xsl/response-3.xsl
+MCR.ContentTransformer.response.Stylesheet=%MCR.ContentTransformer.response-prepared-3.Stylesheet%,xsl/solr/response/response-3.xsl
+MCR.ContentTransformer.response-browse.Stylesheet=xsl/solr/response/response-browse-3.xsl,%MCR.LayoutTransformerFactory.Default.Stylesheets%
 MCR.ContentTransformer.mycoreobject-solrdocument-3.Stylesheet=xsl/solr/searchfields-solrbase.xsl
 MCR.URIResolver.xslImports.solr-document-3=%MCR.URIResolver.xslImports.solr-document-3%,solr/searchfields-solr.xsl
 MCR.URIResolver.xslIncludes.solrResponse-3=%MCR.URIResolver.xslIncludes.solrResponse-3%,solr/response-page.xsl

diff --git a/...hetype-resources/__rootArtifactId__-module/src/main/resources/xsl/actionsAndDerivates.xsl b/...hetype-resources/__rootArtifactId__-module/src/main/resources/xsl/actionsAndDerivates.xsl
@@ -136,7 +136,7 @@
     <xsl:variable name="mainFile" select="maindoc/text()"/>
 
     <xsl:if test="string-length($mainFile)&gt;0">
-      <xsl:variable name="contentType" select="mcrderivate:getContentType($derId, $mainFile)"/>
+      <xsl:variable name="contentType" select="mcrderivate:get-file-content-type($derId, $mainFile)"/>
       <xsl:variable name="supportedContentTypes" select="tokenize($supportedContentTypeStr, ',')" />
       <xsl:variable name="isIview" select="$contentType = $supportedContentTypes"/>
       <xsl:variable name="isPDF" select="$contentType = 'application/pdf'"/>

diff --git a/...tArtifactId__-module/src/main/resources/xsl/layout/__rootArtifactId___layout_template.xsl b/...tArtifactId__-module/src/main/resources/xsl/layout/__rootArtifactId___layout_template.xsl
@@ -114,7 +114,7 @@
         </footer>
 
 
-        <xsl:variable name="mcr_version" select="concat('MyCoRe ', mcrversion:getCompleteVersion())" />
+        <xsl:variable name="mcr_version" select="concat('MyCoRe ', mcrversion:get-complete-version())" />
         <div id="powered_by" class="text-center">
           <a href="http://www.mycore.de">
             <img src="{$WebApplicationBaseURL}content/images/mycore_logo_powered_120x30_blaue_schrift_frei.png" title="{$mcr_version}" alt="powered by MyCoRe" />

diff --git a/...chetype-resources/__rootArtifactId__-module/src/main/resources/xsl/solr/response-page.xsl b/...chetype-resources/__rootArtifactId__-module/src/main/resources/xsl/solr/response-page.xsl
@@ -62,7 +62,7 @@
     <xsl:variable name="href" select="concat($proxyBaseURL,$HttpSession,$solrParams)" />
     <xsl:variable name="startPosition" select="$hitNumberOnPage - 1 + (($currentPage) -1) * $rows" />
     <xsl:variable name="hitHref">
-      <xsl:value-of select="concat($href, '&amp;start=',$startPosition, '&amp;fl=id&amp;rows=1&amp;origrows=', $rows, '&amp;XSL.Style=browse-3')" />
+      <xsl:value-of select="concat($href, '&amp;start=',$startPosition, '&amp;fl=id&amp;rows=1&amp;origrows=', $rows, '&amp;XSL.Style=browse')" />
     </xsl:variable>
 
 	<!-- hit entry -->