From 82d389996e1f615c0cfa6324215f8d5cf37fee1f Mon Sep 17 00:00:00 2001 From: Kathleen Neumann Date: Thu, 12 Sep 2024 10:17:35 +0200 Subject: [PATCH] MIR-1305 - use flavor coming from MCR-3087 for OAI stylesheets, ... remove obsolete msie-note --- .../main/resources/xsl/mir-flatmir-layout.xsl | 2 -- .../resources/config/mir/mycore.properties | 21 +++++++++++++------ .../resources/xsl/layout/mir-layout-utils.xsl | 4 ++-- 3 files changed, 17 insertions(+), 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 index 9c082dc4de..9cf504825b 100644 --- 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 @@ - - diff --git a/mir-module/src/main/resources/config/mir/mycore.properties b/mir-module/src/main/resources/config/mir/mycore.properties index 059833f177..f07da25e4c 100644 --- 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 index c72467deb1..46ca412216 100644 --- 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"> - - + +