MIR-1305 - use flavor coming from MCR-3087 for OAI stylesheets,

... remove obsolete msie-note
MyCoRe-Org · Sep 12, 2024 · 82d3899 · 82d3899
1 parent 25c0b66
commit 82d3899
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/mir-layout/src/main/resources/xsl/mir-flatmir-layout.xsl b/mir-layout/src/main/resources/xsl/mir-flatmir-layout.xsl
@@ -62,8 +62,6 @@
             </div>
           </noscript>
         </header>
-        <!-- include Internet Explorer warning -->
-        <xsl:call-template name="msie-note" />
 
         <xsl:call-template name="mir.jumbotwo" />
 

diff --git a/mir-module/src/main/resources/config/mir/mycore.properties b/mir-module/src/main/resources/config/mir/mycore.properties
@@ -41,13 +41,22 @@ MIR.User.ShowSimpleDetailsOnly=false
 # No XSLT3 by default: Xalan-Compatibility MCR-2966                          #
 ##############################################################################
 # until we are ready to switch to Saxon by default:
-MCR.LayoutService.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
+MCR.LayoutService.TransformerFactoryClass=%XALAN%
 MCR.Layout.Transformer.Factory.XSLFolder=xsl
 
+#mir-module migration to Saxon
+MCR.URIResolver.xslIncludes.components=resource:xsl/mcr-module-startIview2.xsl,resource:xsl/sessionListing.xsl,resource:xsl/processingGUI.xsl,resource:xsl/altoChanges.xsl
+MCR.ContentTransformer.mcr_error.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
+MCR.ContentTransformer.mcr_error.Stylesheet=xsl/mcr_error.xsl,%MCR.LayoutTransformerFactory.Default.Stylesheets%
+MCR.ContentTransformer.MyCoReWebPage.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
+MCR.ContentTransformer.MyCoReWebPage.Stylesheet=xsl/MyCoReWebPage.xsl,%MCR.LayoutTransformerFactory.Default.Stylesheets%
+MCR.ContentTransformer.site.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
+MCR.ContentTransformer.site.Stylesheet=xsl/site.xsl,%MCR.LayoutTransformerFactory.Default.Stylesheets%
+
 #required for mycore-solr
 MCR.URIResolver.xslImports.solr-document=solr-basetemplate.xsl
 MCR.URIResolver.xslImports.solr-document=%MCR.URIResolver.xslImports.solr-document%,mycoreobject-dynamicfields.xsl
-MCR.URIResolver.xslIncludes.components=%MCR.URIResolver.xslIncludes.components%,solr-layout-utils.xsl
+MCR.URIResolver.xslIncludes.components=%MCR.URIResolver.xslIncludes.components%,resource:xsl/solr-layout-utils.xsl
 MCR.ContentTransformer.response.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
 MCR.ContentTransformer.response.Stylesheet=%MCR.ContentTransformer.response-prepared.Stylesheet%,xsl/response.xsl
 MCR.ContentTransformer.response-browse.Stylesheet=xsl/response-browse.xsl
@@ -400,13 +409,13 @@ MCR.OAIDataProvider.OAI2.Sets.driver.URI=webapp:oai/set_driver.xml
 MCR.OAIDataProvider.OAI2.Sets.driver.Query=((derCount:[1 TO *] AND mods.embargo:[* TO NOW]) OR (derCount:[1 TO *] AND NOT mods.embargo:[* TO *])) AND NOT (category.top:mir_licenses\\:rights_reserved)
 MCR.OAIDataProvider.OAI2.Sets.ec_fundedresources.URI=webapp:oai/set_ec_fundedresources.xml
 MCR.OAIDataProvider.OAI2.Sets.ec_fundedresources.Query=((derCount:[1 TO *] AND mods.embargo:[* TO NOW]) OR (derCount:[1 TO *] AND NOT mods.embargo:[* TO *])) AND (mods.identifier:info\\:eu-repo/grantAgreement*)
-MCR.OAIDataProvider.OAI2.Sets.GENRE.URI=xslStyle:classification2sets:classification:metadata:10:children:mir_genres
+MCR.OAIDataProvider.OAI2.Sets.GENRE.URI=xslStyle:classification2sets#xslt:classification:metadata:10:children:mir_genres
 MCR.OAIDataProvider.OAI2.Sets.GENRE.Classification=mir_genres
-MCR.OAIDataProvider.OAI2.Sets.ddc.URI=xslStyle:classification2sets:classification:metadata:10:children:SDNB
+MCR.OAIDataProvider.OAI2.Sets.ddc.URI=xslStyle:classification2sets#xslt:classification:metadata:10:children:SDNB
 MCR.OAIDataProvider.OAI2.Sets.ddc.Classification=SDNB
-MCR.OAIDataProvider.OAI2.Sets.doc-type.URI=xslStyle:classification2sets:classification:metadata:10:children:diniPublType
+MCR.OAIDataProvider.OAI2.Sets.doc-type.URI=xslStyle:classification2sets#xslt:classification:metadata:10:children:diniPublType
 MCR.OAIDataProvider.OAI2.Sets.doc-type.Classification=diniPublType
-MCR.OAIDataProvider.OAI2.Sets.institute.URI=xslStyle:classification2sets:classification:metadata:1:children:mir_institutes
+MCR.OAIDataProvider.OAI2.Sets.institute.URI=xslStyle:classification2sets#xslt:classification:metadata:1:children:mir_institutes
 MCR.OAIDataProvider.OAI2.Sets.institute.Classification=mir_institutes
 #see MIR-435
 MCR.OAIDataProvider.OAI2.DeletedRecord=persistent

diff --git a/mir-module/src/main/resources/xsl/layout/mir-layout-utils.xsl b/mir-module/src/main/resources/xsl/layout/mir-layout-utils.xsl
@@ -3,8 +3,8 @@
   xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation" xmlns:encoder="xalan://java.net.URLEncoder"
   exclude-result-prefixes="i18n encoder">
 
-  <xsl:include href="layout-utils.xsl" />
-  <xsl:include href="mir-accesskey-utils.xsl" />
+  <xsl:include href="../layout-utils.xsl" />
+  <xsl:include href="../mir-accesskey-utils.xsl" />
 
   <xsl:param name="RequestURL" />
   <xsl:param name="WebApplicationBaseURL" />