From be7dd35a90dd59cb9583f5134ee5da03a2ef6c0c Mon Sep 17 00:00:00 2001
From: Thomas Scheffler <github@yagee.de>
Date: Mon, 30 Oct 2023 10:18:10 +0100
Subject: [PATCH] MCR-2966 move Saxon ready stylesheets to /xslt

---
 .../resources/config/mir/mycore.properties    |   50 +-
 .../{xsl => xslt}/MARC21slimUtils.xsl         |    0
 .../resources/{xsl => xslt}/convertjson.xsl   |    0
 .../resources/{xsl => xslt}/marc-tidy.xsl     |    0
 .../metadata/mods-metadata-page.xsl           |    4 +-
 .../resources/{xsl => xslt}/mods2datacite.xsl |    2 +-
 .../resources/{xsl => xslt}/mods2marcxml.xsl  |    0
 .../mycoreobject-datacite-mir.xsl             |    0
 .../{xsl => xslt}/mycoreobject-podcast.xsl    |    0
 .../resources/{xsl => xslt}/rules-helper.xsl  |    0
 .../{xsl => xslt}/sword/jats2mods.xsl         | 1038 ++++++++---------
 .../sword/mycoreobject2dissemin-status.xsl    |    0
 .../{xsl => xslt}/sword/ojsmets2mods.xsl      |    0
 .../java/org/mycore/mir/acl/MIRACLTest.java   |    2 +-
 14 files changed, 561 insertions(+), 535 deletions(-)
 rename mir-module/src/main/resources/{xsl => xslt}/MARC21slimUtils.xsl (100%)
 rename mir-module/src/main/resources/{xsl => xslt}/convertjson.xsl (100%)
 rename mir-module/src/main/resources/{xsl => xslt}/marc-tidy.xsl (100%)
 rename mir-module/src/main/resources/{xsl => xslt}/metadata/mods-metadata-page.xsl (98%)
 rename mir-module/src/main/resources/{xsl => xslt}/mods2datacite.xsl (93%)
 rename mir-module/src/main/resources/{xsl => xslt}/mods2marcxml.xsl (100%)
 rename mir-module/src/main/resources/{xsl => xslt}/mycoreobject-datacite-mir.xsl (100%)
 rename mir-module/src/main/resources/{xsl => xslt}/mycoreobject-podcast.xsl (100%)
 rename mir-module/src/main/resources/{xsl => xslt}/rules-helper.xsl (100%)
 rename mir-module/src/main/resources/{xsl => xslt}/sword/jats2mods.xsl (97%)
 rename mir-module/src/main/resources/{xsl => xslt}/sword/mycoreobject2dissemin-status.xsl (100%)
 rename mir-module/src/main/resources/{xsl => xslt}/sword/ojsmets2mods.xsl (100%)

diff --git a/mir-module/src/main/resources/config/mir/mycore.properties b/mir-module/src/main/resources/config/mir/mycore.properties
index 2476e45b80..87ace973f3 100644
--- a/mir-module/src/main/resources/config/mir/mycore.properties
+++ b/mir-module/src/main/resources/config/mir/mycore.properties
@@ -26,9 +26,35 @@ MIR.User.ShowSimpleDetailsOnly=false
 # Important overwrites of MyCoRe defaults                                    #
 ##############################################################################
 
+##############################################################################
+# 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.Layout.Transformer.Factory.XSLFolder=xsl
+
+#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.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
+MCR.ContentTransformer.mycoreobject-solrdocument.Class=org.mycore.common.content.transformer.MCRXSL2JAXBTransformer
+MCR.ContentTransformer.mycoreobject-solrdocument.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
+MCR.ContentTransformer.mycoreobject-solrdocument.Stylesheet=xsl/mycoreobject-solrdocument.xsl
+MCR.ContentTransformer.mycoreobject-solrdocument.Context=org.mycore.solr.index.document.jaxb
+MCR.ContentTransformer.response-solrdocument.Class=org.mycore.common.content.transformer.MCRXSL2JAXBTransformer
+MCR.ContentTransformer.response-solrdocument.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
+MCR.ContentTransformer.response-solrdocument.Stylesheet=xsl/response2batch.xsl,%MCR.ContentTransformer.mycoreobject-solrdocument.Stylesheet%
+MCR.ContentTransformer.response-solrdocument.Context=%MCR.ContentTransformer.mycoreobject-solrdocument.Context%
+MCR.ContentTransformer.response-prepared.Class=org.mycore.common.content.transformer.MCRXSLTransformer
+MCR.ContentTransformer.response-prepared.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
+MCR.ContentTransformer.response-prepared.Stylesheet=xsl/response-join-results.xsl,xsl/response-addDocId.xsl,xsl/response-addDerivates.xsl
+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
 
 ##############################################################################
 # Configure ACL Checking                                                     #
@@ -51,7 +77,7 @@ MCR.ACL.AccessKey.Strategy.AllowedSessionPermissionTypes=
 ##############################################################################
 
 MCR.ContentTransformer.rules-helper.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
-MCR.ContentTransformer.rules-helper.Stylesheet=xsl/rules-helper.xsl
+MCR.ContentTransformer.rules-helper.Stylesheet=xslt/rules-helper.xsl
 
 #MCR.Access.Strategy.Class=org.mycore.access.facts.MCRFactsAccessSystem
 #MCR.Access.Class=org.mycore.access.facts.MCRFactsAccessSystem
@@ -254,7 +280,7 @@ MCR.ContentTransformer.response-mycoreobject.Stylesheet=xsl/response2mycoreobjec
 MCR.ContentTransformer.response-browse.Class=org.mycore.common.content.transformer.MCRTransformerPipe
 MCR.ContentTransformer.response-browse.Steps=response-mycoreobject,mycoreobject
 MCR.ContentTransformer.mods2xeditor.Stylesheet=xsl/editor/mods2xeditor.xsl
-MCR.ContentTransformer.mods2marcxml.Stylesheet=xsl/mods2marcxml.xsl,xsl/marc-tidy.xsl
+MCR.ContentTransformer.mods2marcxml.Stylesheet=xslt/mods2marcxml.xsl,xslt/marc-tidy.xsl
 MCR.ContentTransformer.mods2marcxml.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
 MCR.ContentTransformer.marcxml.Class=org.mycore.common.content.transformer.MCRTransformerPipe
 MCR.ContentTransformer.marcxml.Steps=mods,mods2marcxml
@@ -264,9 +290,9 @@ MCR.ContentTransformer.oai-mods.Stylesheet=xsl/mods2mods.xsl
 MCR.ContentTransformer.oai-epicur.Stylesheet=xsl/mods2epicur.xsl
 MCR.ContentTransformer.oai-xMetaDissPlus.Stylesheet=xsl/mods2xMetaDissPlus.xsl
 MCR.ContentTransformer.oai-oai_dc.Stylesheet=xsl/mods2oai_dc.xsl
-MCR.ContentTransformer.datacite.Stylesheet=xsl/mycoreobject-datacite-mir.xsl
+MCR.ContentTransformer.datacite.Stylesheet=xslt/mycoreobject-datacite-mir.xsl
 MCR.ContentTransformer.datacite.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
-MCR.ContentTransformer.oai-oai_datacite.Stylesheet=xsl/mods2datacite.xsl
+MCR.ContentTransformer.oai-oai_datacite.Stylesheet=xslt/mods2datacite.xsl
 MCR.ContentTransformer.oai-oai_datacite.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
 MCR.URIResolver.xslIncludes.datacite=mycoreobject-datacite-mir.xsl
 
@@ -276,7 +302,7 @@ MCR.ContentTransformer.response-resultlist.Stylesheet=%MCR.ContentTransformer.re
 MCR.Viewer.metadata.transformer = mycoreobject-viewer
 MCR.ContentTransformer.mycoreobject-viewer.Stylesheet=xsl/mycoreobject-mods.xsl,xsl/mods-pure-viewer.xsl
 
-MCR.ContentTransformer.pica2mods.Stylesheet=xsl/pica2mods.xsl
+MCR.ContentTransformer.pica2mods.Stylesheet=xslt/pica2mods.xsl
 MCR.ContentTransformer.pica2mods.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
 
 # Configure stylesheets used by content transformers
@@ -289,7 +315,7 @@ MIR.xMetaDissPlus.person.termsOfAddress2academicTitle=false
 ##############################################################################
 # Support for Podcasts                                                       #
 ##############################################################################
-MCR.ContentTransformer.mycoreobject-podcast.Stylesheet=xsl/mycoreobject-podcast.xsl
+MCR.ContentTransformer.mycoreobject-podcast.Stylesheet=xslt/mycoreobject-podcast.xsl
 MCR.ContentTransformer.mycoreobject-podcast.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
 # Apple requires an image of 3000x3000
 MCR.IIIFImage.thumbnail.MaxImageBytes=27000000
@@ -480,7 +506,7 @@ MCR.GoogleSitemap.SolrQuery=worldReadable:true AND ((objectType:mods AND -state:
 # MCR.Sword.DefaultOJS.State = imported
 
 # MCR.ContentTransformer.ojsmets2mods.Class=org.mycore.common.content.transformer.MCRXSLTransformer
-# MCR.ContentTransformer.ojsmets2mods.Stylesheet=xsl/sword/ojsmets2mods.xsl
+# MCR.ContentTransformer.ojsmets2mods.Stylesheet=xslt/sword/ojsmets2mods.xsl
 # MCR.ContentTransformer.ojsmets2mods.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
 
 # Goobi
@@ -499,7 +525,7 @@ MCR.GoogleSitemap.SolrQuery=worldReadable:true AND ((objectType:mods AND -state:
 
 # MCR.ContentTransformer.deepgreenjats2mods.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
 # MCR.ContentTransformer.deepgreenjats2mods.Class=org.mycore.common.content.transformer.MCRXSLTransformer
-# MCR.ContentTransformer.deepgreenjats2mods.Stylesheet=xsl/sword/jats2mods.xsl
+# MCR.ContentTransformer.deepgreenjats2mods.Stylesheet=xslt/sword/jats2mods.xsl
 
 # When set to "embed", related host publication (journal) will be embedded.
 # When set to "link", related host publication (journal) will be created and/or linked via @xlink:href.
@@ -515,7 +541,7 @@ MCR.GoogleSitemap.SolrQuery=worldReadable:true AND ((objectType:mods AND -state:
 # MCR.ContentTransformer.dissemin2mods.Stylesheet=xsl/sword/dissemin-mods2mycore-mods.xsl
 
 # MCR.ContentTransformer.mycoreobject2dissemin-status.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
-# MCR.ContentTransformer.mycoreobject2dissemin-status.Stylesheet=xsl/sword/mycoreobject2dissemin-status.xsl
+# MCR.ContentTransformer.mycoreobject2dissemin-status.Stylesheet=xslt/sword/mycoreobject2dissemin-status.xsl
 
 
 ##############################################################################
@@ -643,7 +669,7 @@ MIR.OADOI.Mail.Address=%MCR.mir-module.MailSender%
 MCR.MODS.EnrichmentResolver.DataSource.OADOI.IdentifierTypes=doi
 MCR.MODS.EnrichmentResolver.DataSource.OADOI.doi.URI=xslStyle:import/simplify-json-xml,import/oadoi2mods:xslTransform:json2xml:https://api.oadoi.org/v2/{1}?email=%MIR.OADOI.Mail.Address%
 MCR.ContentTransformer.dummy-json2xml.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
-MCR.ContentTransformer.dummy-json2xml.Stylesheet=xsl/convertjson.xsl
+MCR.ContentTransformer.dummy-json2xml.Stylesheet=xslt/convertjson.xsl
 MCR.ContentTransformer.json2xml.Class=org.mycore.mir.importer.JSON2XMLTransformer
 
 # Embargo auto release
@@ -707,7 +733,7 @@ MIR.Workflow.Box=false
 # new Metadata Layout                                                        #
 ##############################################################################
 MCR.ContentTransformer.DefaultStep.Stylesheet=%MCR.LayoutTransformerFactory.Default.Stylesheets%
-MCR.ContentTransformer.newMetadataStylesheet.Stylesheet=xsl/metadata/mods-metadata-page.xsl
+MCR.ContentTransformer.newMetadataStylesheet.Stylesheet=xslt/metadata/mods-metadata-page.xsl
 MCR.ContentTransformer.newMetadataStylesheet.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
 MCR.ContentTransformer.mycoreobject.Class=org.mycore.common.content.transformer.MCRTransformerPipe
 MCR.ContentTransformer.mycoreobject.Steps=mycoreobject-modsmeta,newMetadataStylesheet,DefaultStep
diff --git a/mir-module/src/main/resources/xsl/MARC21slimUtils.xsl b/mir-module/src/main/resources/xslt/MARC21slimUtils.xsl
similarity index 100%
rename from mir-module/src/main/resources/xsl/MARC21slimUtils.xsl
rename to mir-module/src/main/resources/xslt/MARC21slimUtils.xsl
diff --git a/mir-module/src/main/resources/xsl/convertjson.xsl b/mir-module/src/main/resources/xslt/convertjson.xsl
similarity index 100%
rename from mir-module/src/main/resources/xsl/convertjson.xsl
rename to mir-module/src/main/resources/xslt/convertjson.xsl
diff --git a/mir-module/src/main/resources/xsl/marc-tidy.xsl b/mir-module/src/main/resources/xslt/marc-tidy.xsl
similarity index 100%
rename from mir-module/src/main/resources/xsl/marc-tidy.xsl
rename to mir-module/src/main/resources/xslt/marc-tidy.xsl
diff --git a/mir-module/src/main/resources/xsl/metadata/mods-metadata-page.xsl b/mir-module/src/main/resources/xslt/metadata/mods-metadata-page.xsl
similarity index 98%
rename from mir-module/src/main/resources/xsl/metadata/mods-metadata-page.xsl
rename to mir-module/src/main/resources/xslt/metadata/mods-metadata-page.xsl
index 204f23b958..f19a9248dc 100644
--- a/mir-module/src/main/resources/xsl/metadata/mods-metadata-page.xsl
+++ b/mir-module/src/main/resources/xslt/metadata/mods-metadata-page.xsl
@@ -5,8 +5,8 @@
                 exclude-result-prefixes="mcri18n mcrproperty"
                 version="3.0">
 
-  <xsl:include href="functions/i18n.xsl" />
-  <xsl:include href="functions/property.xsl" />
+  <xsl:include href="resource:xslt/functions/i18n.xsl" />
+  <xsl:include href="resource:xslt/functions/property.xsl" />
 
   <xsl:param name="MIR.Layout.Top"/>
   <xsl:param name="MIR.Layout.End"/>
diff --git a/mir-module/src/main/resources/xsl/mods2datacite.xsl b/mir-module/src/main/resources/xslt/mods2datacite.xsl
similarity index 93%
rename from mir-module/src/main/resources/xsl/mods2datacite.xsl
rename to mir-module/src/main/resources/xslt/mods2datacite.xsl
index 8ee062a470..ee0b34857b 100644
--- a/mir-module/src/main/resources/xsl/mods2datacite.xsl
+++ b/mir-module/src/main/resources/xslt/mods2datacite.xsl
@@ -4,4 +4,4 @@
   <xsl:template match="/">
     <xsl:apply-templates />
   </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/mods2marcxml.xsl b/mir-module/src/main/resources/xslt/mods2marcxml.xsl
similarity index 100%
rename from mir-module/src/main/resources/xsl/mods2marcxml.xsl
rename to mir-module/src/main/resources/xslt/mods2marcxml.xsl
diff --git a/mir-module/src/main/resources/xsl/mycoreobject-datacite-mir.xsl b/mir-module/src/main/resources/xslt/mycoreobject-datacite-mir.xsl
similarity index 100%
rename from mir-module/src/main/resources/xsl/mycoreobject-datacite-mir.xsl
rename to mir-module/src/main/resources/xslt/mycoreobject-datacite-mir.xsl
diff --git a/mir-module/src/main/resources/xsl/mycoreobject-podcast.xsl b/mir-module/src/main/resources/xslt/mycoreobject-podcast.xsl
similarity index 100%
rename from mir-module/src/main/resources/xsl/mycoreobject-podcast.xsl
rename to mir-module/src/main/resources/xslt/mycoreobject-podcast.xsl
diff --git a/mir-module/src/main/resources/xsl/rules-helper.xsl b/mir-module/src/main/resources/xslt/rules-helper.xsl
similarity index 100%
rename from mir-module/src/main/resources/xsl/rules-helper.xsl
rename to mir-module/src/main/resources/xslt/rules-helper.xsl
diff --git a/mir-module/src/main/resources/xsl/sword/jats2mods.xsl b/mir-module/src/main/resources/xslt/sword/jats2mods.xsl
similarity index 97%
rename from mir-module/src/main/resources/xsl/sword/jats2mods.xsl
rename to mir-module/src/main/resources/xslt/sword/jats2mods.xsl
index 3ab44819ae..f5f43d6281 100644
--- a/mir-module/src/main/resources/xsl/sword/jats2mods.xsl
+++ b/mir-module/src/main/resources/xslt/sword/jats2mods.xsl
@@ -1,519 +1,519 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Used to import JATs metadata from DeepGreen via SWORD -->
-<!-- See https://jats.nlm.nih.gov -->
-
-<!-- TODO: <pub-date pub-type="ppub" date-type="actual"> -->
-<!-- TODO: abbrev title = main title -->
-<!-- TODO: <xref ref-type="aff" rid="A">a oder <sup>1</sup></xref> -->
-<!-- TODO: funding-group -->
-<!-- TODO: map article-type to mods:genre -->
-<!-- TODO: lookup existing host for xlink:href -->
-
-<xsl:stylesheet version="3.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns:mods="http://www.loc.gov/mods/v3"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
-
-  <xsl:param name="MIR.projectid.default" />
-
-  <!-- Helpers to convert uppercase to lowercase -->
-  <xsl:variable name="upperABC" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'" />
-  <xsl:variable name="lowerABC" select="'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'" />
-
-  <xsl:template match="article">
-    <mods:mods>
-      <mods:typeOfResource>text</mods:typeOfResource>
-      <xsl:call-template name="genre_article" />
-
-      <xsl:for-each select="front/article-meta">
-        <xsl:apply-templates select="title-group" />
-        <xsl:apply-templates select="contrib-group/contrib" />
-        <xsl:apply-templates select="article-id" />
-        <xsl:call-template name="originInfo" />
-        <xsl:apply-templates select="../journal-meta" />
-        <xsl:apply-templates select="abstract|trans-abstract" />
-        <xsl:apply-templates select="kwd-group/kwd" />
-        <xsl:apply-templates select="permissions/copyright-statement" />
-        <xsl:apply-templates select="permissions/license" />
-        <xsl:if test="not(permissions/license)">
-          <xsl:call-template name="oa_nlz" />
-        </xsl:if>
-
-      </xsl:for-each>
-      <xsl:apply-templates select="@xml:lang" mode="lang2mods" />
-      <xsl:apply-templates select="." mode="copy" />
-    </mods:mods>
-  </xsl:template>
-
-  <xsl:template match="article" mode="copy">
-    <mods:extension>
-      <xsl:copy-of select="." />
-    </mods:extension>
-  </xsl:template>
-
-  <xsl:template name="genre_article">
-    <mods:genre type="intern">
-      <xsl:call-template name="setAuthorityValueURIs">
-        <xsl:with-param name="classification">mir_genres</xsl:with-param>
-        <xsl:with-param name="category">article</xsl:with-param>
-      </xsl:call-template>
-    </mods:genre>
-  </xsl:template>
-
-  <xsl:template name="genre_journal">
-    <mods:genre type="intern">
-      <xsl:call-template name="setAuthorityValueURIs">
-        <xsl:with-param name="classification">mir_genres</xsl:with-param>
-        <xsl:with-param name="category">journal</xsl:with-param>
-      </xsl:call-template>
-    </mods:genre>
-  </xsl:template>
-
-  <xsl:template name="setAuthorityValueURIs">
-    <xsl:param name="classification" />
-    <xsl:param name="category" />
-
-    <xsl:variable name="uri1"  select="concat('classification:metadata:1:children:',$classification)" />
-    <xsl:variable name="uri2" select="document($uri1)/*/label[@xml:lang='x-uri']/@text" />
-    <xsl:attribute name="authorityURI">
-      <xsl:value-of select="$uri2" />
-    </xsl:attribute>
-    <xsl:attribute name="valueURI">
-      <xsl:value-of select="$uri2" />
-      <xsl:text>#</xsl:text>
-      <xsl:value-of select="$category" />
-    </xsl:attribute>
-  </xsl:template>
-
-  <xsl:template match="journal-meta">
-    <mods:relatedItem type="host">
-      <xsl:call-template name="href" />
-      <xsl:call-template name="genre_journal" />
-      <xsl:apply-templates select="descendant::journal-title|descendant::abbrev-journal-title" />
-      <xsl:for-each select="../article-meta">
-        <mods:part>
-          <xsl:apply-templates select="volume" />
-          <xsl:apply-templates select="issue" />
-          <xsl:call-template name="pages" />
-        </mods:part>
-      </xsl:for-each>
-      <xsl:apply-templates select="issn" />
-      <xsl:call-template name="originInfo" />
-    </mods:relatedItem>
-  </xsl:template>
-
-  <xsl:param name="MCR.ContentTransformer.deepgreenjats2mods.HostRelation" select="'link'" />
-
-  <xsl:template name="href">
-    <xsl:if test="$MCR.ContentTransformer.deepgreenjats2mods.HostRelation='link'">
-      <xsl:variable name="solrQueryISSN">
-        <xsl:for-each select="issn">
-          <xsl:if test="not(position()=1)">
-            <xsl:text>+</xsl:text>
-          </xsl:if>
-          <xsl:value-of select="."/>
-        </xsl:for-each>
-      </xsl:variable>
-      <xsl:variable name="solrQuery"
-                    select="document(concat('solr:main:q=%2Bmods.identifier%3A%28', $solrQueryISSN, '%29%20AND%20%2Bmods.genre%3Ajournal'))" />
-      <xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink">
-        <xsl:choose>
-          <xsl:when test="$solrQuery/response/result/@numFound &gt; 0">
-            <xsl:value-of select="$solrQuery/response/result/doc[1]/str[@name='id']" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$MIR.projectid.default" />
-            <xsl:text>_mods_00000000</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="originInfo">
-    <xsl:if test="pub-date|publisher">
-      <mods:originInfo eventType="publication">
-        <xsl:call-template name="pub-date" />
-        <xsl:apply-templates select="publisher" />
-      </mods:originInfo>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="pages">
-    <xsl:if test="fpage|lpage">
-      <mods:extent unit="pages">
-        <xsl:apply-templates select="fpage|lpage" />
-      </mods:extent>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="fpage">
-    <mods:start>
-      <xsl:value-of select="." />
-    </mods:start>
-  </xsl:template>
-
-  <xsl:template match="lpage">
-    <mods:end>
-      <xsl:value-of select="." />
-    </mods:end>
-  </xsl:template>
-
-  <xsl:template match="article/@xml:lang" mode="lang2mods">
-    <mods:language>
-      <mods:languageTerm type="code" authority="rfc5646">
-        <xsl:value-of select="translate(.,$upperABC,$lowerABC)" />
-      </mods:languageTerm>
-    </mods:language>
-  </xsl:template>
-
-  <xsl:template match="@xml:lang">
-    <xsl:attribute name="xml:lang">
-      <xsl:value-of select="translate(.,$upperABC,$lowerABC)" />
-    </xsl:attribute>
-  </xsl:template>
-
-  <xsl:variable name="idTypes" select="document('classification:metadata:-1:children:identifier')//categories" />
-
-  <xsl:template match="article-id">
-    <!-- only import supported identifier types -->
-    <xsl:if test="$idTypes/category[@ID=current()/@pub-id-type]">
-      <mods:identifier type="{@pub-id-type}">
-        <xsl:value-of select="." />
-      </mods:identifier>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="title-group">
-    <mods:titleInfo>
-      <xsl:apply-templates select="article-title" />
-      <xsl:apply-templates select="subtitle" />
-    </mods:titleInfo>
-    <xsl:apply-templates select="trans-title-group" />
-  </xsl:template>
-
-  <xsl:template match="article-title">
-    <xsl:apply-templates select="@xml:lang" />
-    <xsl:if test="not(@xml:lang)">
-      <xsl:apply-templates select="/*/@xml:lang" />
-    </xsl:if>
-    <mods:title>
-      <xsl:value-of select="normalize-space(.)" />
-    </mods:title>
-  </xsl:template>
-
-  <xsl:template match="trans-title">
-    <xsl:apply-templates select="@xml:lang" />
-    <mods:title>
-      <xsl:value-of select="normalize-space(.)" />
-    </mods:title>
-  </xsl:template>
-
-  <xsl:template match="subtitle|trans-subtitle">
-    <mods:subTitle>
-      <xsl:value-of select="." />
-    </mods:subTitle>
-  </xsl:template>
-
-  <xsl:template match="trans-title-group">
-    <mods:titleInfo type="translated">
-      <xsl:apply-templates select="trans-title" />
-      <xsl:apply-templates select="trans-subtitle" />
-    </mods:titleInfo>
-  </xsl:template>
-
-  <!-- If no main title, use abbreviated title of type "full" as main title -->
-  <xsl:template match="journal-title|abbrev-journal-title[@abbrev-type='full'][not(../journal-title)]">
-    <mods:titleInfo>
-      <xsl:apply-templates select="@xml:lang" />
-      <mods:title>
-        <xsl:value-of select="normalize-space(.)" />
-      </mods:title>
-    </mods:titleInfo>
-  </xsl:template>
-
-  <!-- Ignore abbreviated title if same as main title -->
-  <xsl:template match="abbrev-journal-title[normalize-space(.)=normalize-space(../journal-title)]" priority="1" />
-
-  <xsl:template match="abbrev-journal-title">
-    <mods:titleInfo type="abbreviated">
-      <xsl:apply-templates select="@xml:lang" />
-      <mods:title>
-        <xsl:value-of select="normalize-space(.)" />
-      </mods:title>
-    </mods:titleInfo>
-  </xsl:template>
-
-  <xsl:template match="contrib">
-    <mods:name type="personal">
-      <xsl:for-each select="name|string-name">
-        <xsl:apply-templates select="surname" />
-        <xsl:apply-templates select="given-names" />
-        <xsl:apply-templates select="prefix|suffix" />
-      </xsl:for-each>
-      <xsl:call-template name="affiliation" />
-      <xsl:apply-templates select="@contrib-type" />
-      <xsl:apply-templates select="contrib-id" />
-    </mods:name>
-  </xsl:template>
-
-  <xsl:template match="surname">
-    <mods:namePart type="family">
-      <xsl:value-of select="." />
-    </mods:namePart>
-  </xsl:template>
-
-  <xsl:template match="given-names">
-    <mods:namePart type="given">
-      <xsl:value-of select="." />
-    </mods:namePart>
-  </xsl:template>
-
-  <xsl:template match="prefix|suffix">
-    <mods:namePart type="termsOfAddress">
-      <xsl:value-of select="." />
-    </mods:namePart>
-  </xsl:template>
-
-  <!-- Try to map contributor roles by comparing labels in marcrelator classification -->
-
-  <xsl:variable name="roles" select="document('classification:metadata:-1:children:marcrelator')/mycoreclass" />
-
-  <xsl:template match="@contrib-type">
-    <xsl:variable name="role" select="translate(.,$upperABC,$lowerABC)" />
-    <xsl:variable name="categoryID" select="$roles//category[label[translate(@text,$upperABC,$lowerABC)=$role]]/@ID" />
-
-    <mods:role>
-      <mods:roleTerm>
-        <xsl:choose>
-          <xsl:when test="string-length($categoryID) &gt; 0">
-            <xsl:attribute name="type">code</xsl:attribute>
-            <xsl:attribute name="authority">marcrelator</xsl:attribute>
-            <xsl:value-of select="$categoryID" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="type">text</xsl:attribute>
-            <xsl:value-of select="." />
-          </xsl:otherwise>
-        </xsl:choose>
-      </mods:roleTerm>
-    </mods:role>
-  </xsl:template>
-
-  <xsl:template name="affiliation">
-    <xsl:choose>
-      <!-- Link to affiliation via xref ID -->
-      <xsl:when test="xref[(@ref-type='aff') or not(@ref-type)][string-length(@rid) > 0]">
-        <xsl:apply-templates select="xref[(@ref-type='aff') or not(@ref-type)][string-length(@rid) > 0]" />
-      </xsl:when>
-      <!-- Affiliation is given at article level -->
-      <xsl:when test="not(xref[(@ref-type='aff') or not(@ref-type)])
-        and //article-meta/aff[not(@*)][position()=last()][string-length(text()[1]) > 0]">
-        <xsl:apply-templates select="//article-meta/aff[not(@*)][position()=last()][string-length(text()[1]) > 0]" />
-      </xsl:when>
-      <!-- Affiliation is given in aff ellement -->
-      <xsl:otherwise>
-        <xsl:apply-templates select="aff" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Affiliations may be linked via @id/xref -->
-  <xsl:key name="rid2aff" match="//aff[@id]" use="@id" />
-
-  <xsl:template match="xref[(@ref-type='aff') or not(@ref-type)]">
-    <xsl:apply-templates select="key('rid2aff',@rid)" />
-  </xsl:template>
-
-  <xsl:template match="aff">
-    <mods:affiliation>
-      <xsl:apply-templates select="node()" mode="copy-affiliation" />
-    </mods:affiliation>
-  </xsl:template>
-  
-  <xsl:template match="text()" mode="copy-affiliation">
-    <xsl:value-of select="normalize-space(.)" />  
-  </xsl:template>
-  
-  <xsl:template match="break" mode="copy-affiliation">
-    <xsl:text> </xsl:text>
-  </xsl:template>
-
-  <xsl:template match="named-content|institution|institution-wrap|postal-code|addr-line|city|country" mode="copy-affiliation">
-    <xsl:apply-templates select="node()" mode="copy-affiliation" />
-    <xsl:if test="following::*">
-      <xsl:text> </xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="*" mode="copy-affiliation" />
-
-  <xsl:template match="contrib-id">
-    <mods:nameIdentifier type="{@contrib-id-type}">
-      <xsl:value-of select="." />
-    </mods:nameIdentifier>
-  </xsl:template>
-  
-  <xsl:variable name="orcidSite">orcid.org/</xsl:variable>
-
-  <!-- Reduce ORCID iDs given as complete URL -->
-  <xsl:template match="contrib-id[contains(.,$orcidSite)]" priority="1">
-    <xsl:variable name="orcid" select="substring-after(.,$orcidSite)"/>
-    <mods:nameIdentifier type="orcid">
-      <xsl:value-of select="$orcid" />
-    </mods:nameIdentifier>
-  </xsl:template>
-
-  <!-- Ignore empty ORCIDs -->
-  <xsl:template match="contrib-id[(normalize-space() = '')
-    or (contains(., $orcidSite) and normalize-space(substring-after(., $orcidSite)) = '')]" priority="2" />
-<!--  <xsl:template match="contrib-id[contains(.,$orcidSite)][normalize-space(substring-after(.,$orcidSite)) = '']" priority="2" />-->
-
-  <xsl:template name="pub-date">
-    <xsl:choose>
-      <xsl:when test="pub-date[(@pub-type='ppub') or ((@date-type='pub') and (@publication-format='print'))]">
-        <xsl:apply-templates select="pub-date[(@pub-type='ppub') or ((@date-type='pub') and (@publication-format='print'))][1]" />
-      </xsl:when>
-      <xsl:when test="pub-date[(@pub-type='epub') or ((@date-type='pub') and (@publication-format='electronic'))]">
-        <xsl:apply-templates select="pub-date[(@pub-type='epub') or ((@date-type='pub') and (@publication-format='electronic'))][1]" />
-      </xsl:when>
-      <xsl:when test="pub-date[(@pub-type='ppub') or (@date-type='pub')]">
-        <xsl:apply-templates select="pub-date[(@pub-type='ppub') or (@date-type='pub')][1]" />
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="pub-date[@iso-8601-date]">
-    <mods:dateIssued encoding="w3cdtf">
-      <xsl:value-of select="@iso-8601-date" />
-    </mods:dateIssued>
-  </xsl:template>
-
-  <xsl:template match="pub-date">
-    <mods:dateIssued encoding="w3cdtf">
-      <xsl:value-of select="year" />
-      <xsl:apply-templates select="month" />
-      <xsl:apply-templates select="day" />
-    </mods:dateIssued>
-  </xsl:template>
-
-  <xsl:template match="day|month">
-    <xsl:text>-</xsl:text>
-    <xsl:if test="string-length(.)=1">0</xsl:if>
-    <xsl:value-of select="." />
-  </xsl:template>
-
-  <xsl:template match="volume|issue">
-    <mods:detail type="{name()}">
-      <mods:number>
-        <xsl:value-of select="." />
-      </mods:number>
-    </mods:detail>
-  </xsl:template>
-
-  <xsl:template match="abstract[@type='toc']">
-    <mods:tableOfContents>
-      <xsl:apply-templates select="@xml:lang" />
-      <xsl:apply-templates select="*|text()" />
-    </mods:tableOfContents>
-  </xsl:template>
-
-  <xsl:template match="abstract|trans-abstract">
-    <mods:abstract>
-      <xsl:apply-templates select="@xml:lang" />
-      <xsl:apply-templates select="*|text()" />
-    </mods:abstract>
-  </xsl:template>
-
-  <xsl:template match="kwd-group/kwd">
-    <mods:subject>
-      <mods:topic>
-        <xsl:value-of select="." />
-      </mods:topic>
-    </mods:subject>
-  </xsl:template>
-
-  <xsl:template match="issn">
-    <mods:identifier type="issn">
-      <xsl:value-of select="." />
-    </mods:identifier>
-  </xsl:template>
-
-  <xsl:template match="publisher">
-    <xsl:apply-templates select="publisher-name" />
-    <xsl:apply-templates select="publisher-loc" />
-  </xsl:template>
-
-  <xsl:template match="publisher-name">
-    <mods:publisher>
-      <xsl:value-of select="." />
-    </mods:publisher>
-  </xsl:template>
-
-  <xsl:template match="publisher-loc">
-    <mods:place>
-      <mods:placeTerm type="text">
-        <xsl:value-of select="." />
-      </mods:placeTerm>
-    </mods:place>
-  </xsl:template>
-
-  <xsl:template match="permissions/copyright-statement">
-    <mods:accessCondition type="copyrightMD" xmlns:cmd="http://www.cdlib.org/inside/diglib/copyrightMD">
-      <cmd:copyright copyright.status="copyrighted" publication.status="published"
-        xsi:schemaLocation="http://www.cdlib.org/inside/diglib/copyrightMD https://www.cdlib.org/groups/rmg/docs/copyrightMD.xsd">
-        <cmd:rights.holder>
-          <cmd:name>
-            <xsl:value-of select="." />
-          </cmd:name>
-        </cmd:rights.holder>
-      </cmd:copyright>
-    </mods:accessCondition>
-  </xsl:template>
-
-  <!-- Map license URL to category in mir_licenses -->
-
-  <xsl:variable name="mir_licenses" select="document('classification:metadata:-1:children:mir_licenses')/mycoreclass" />
-  <xsl:variable name="mir_licenses_uri" select="$mir_licenses/label[@xml:lang='x-uri']/@text" />
-
-  <xsl:template match="permissions/license">
-    <xsl:variable name="url">
-      <xsl:choose>
-        <xsl:when test="@xlink:href">
-          <xsl:value-of select="substring-after(@xlink:href,'//')"/>
-        </xsl:when>
-        <xsl:when test="license-p/ext-link/@xlink:href">
-          <xsl:value-of select="substring-after(license-p/ext-link/@xlink:href,'//')"/>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="categoryID" select="$mir_licenses//category[url[contains(@xlink:href,$url)]]/@ID" />
-
-      <xsl:choose>
-        <xsl:when test="string-length($url) and (string-length($categoryID) &gt; 0)">
-        <mods:accessCondition type="use and reproduction">
-          <xsl:attribute name="xlink:href">
-            <xsl:value-of select="concat($mir_licenses_uri,'#',$categoryID)" />
-          </xsl:attribute>
-        </mods:accessCondition>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- Can not recognize license, use default license, and safe original license text -->
-          <mods:accessCondition type="use and reproduction" xlink:href="{$mir_licenses_uri}#oa_nlz" />
-          <mods:accessCondition type="use and reproduction">
-            <xsl:value-of select="license-p" />
-          </mods:accessCondition>
-        </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <!-- OA im Zuge einer National-/Allianz-Lizenz -->
-  <xsl:template name="oa_nlz">
-    <mods:accessCondition type="use and reproduction" xlink:href="{$mir_licenses_uri}#oa_nlz" />
-  </xsl:template>
-
-</xsl:stylesheet>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Used to import JATs metadata from DeepGreen via SWORD -->
+<!-- See https://jats.nlm.nih.gov -->
+
+<!-- TODO: <pub-date pub-type="ppub" date-type="actual"> -->
+<!-- TODO: abbrev title = main title -->
+<!-- TODO: <xref ref-type="aff" rid="A">a oder <sup>1</sup></xref> -->
+<!-- TODO: funding-group -->
+<!-- TODO: map article-type to mods:genre -->
+<!-- TODO: lookup existing host for xlink:href -->
+
+<xsl:stylesheet version="3.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:mods="http://www.loc.gov/mods/v3"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+
+  <xsl:param name="MIR.projectid.default" />
+
+  <!-- Helpers to convert uppercase to lowercase -->
+  <xsl:variable name="upperABC" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'" />
+  <xsl:variable name="lowerABC" select="'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'" />
+
+  <xsl:template match="article">
+    <mods:mods>
+      <mods:typeOfResource>text</mods:typeOfResource>
+      <xsl:call-template name="genre_article" />
+
+      <xsl:for-each select="front/article-meta">
+        <xsl:apply-templates select="title-group" />
+        <xsl:apply-templates select="contrib-group/contrib" />
+        <xsl:apply-templates select="article-id" />
+        <xsl:call-template name="originInfo" />
+        <xsl:apply-templates select="../journal-meta" />
+        <xsl:apply-templates select="abstract|trans-abstract" />
+        <xsl:apply-templates select="kwd-group/kwd" />
+        <xsl:apply-templates select="permissions/copyright-statement" />
+        <xsl:apply-templates select="permissions/license" />
+        <xsl:if test="not(permissions/license)">
+          <xsl:call-template name="oa_nlz" />
+        </xsl:if>
+
+      </xsl:for-each>
+      <xsl:apply-templates select="@xml:lang" mode="lang2mods" />
+      <xsl:apply-templates select="." mode="copy" />
+    </mods:mods>
+  </xsl:template>
+
+  <xsl:template match="article" mode="copy">
+    <mods:extension>
+      <xsl:copy-of select="." />
+    </mods:extension>
+  </xsl:template>
+
+  <xsl:template name="genre_article">
+    <mods:genre type="intern">
+      <xsl:call-template name="setAuthorityValueURIs">
+        <xsl:with-param name="classification">mir_genres</xsl:with-param>
+        <xsl:with-param name="category">article</xsl:with-param>
+      </xsl:call-template>
+    </mods:genre>
+  </xsl:template>
+
+  <xsl:template name="genre_journal">
+    <mods:genre type="intern">
+      <xsl:call-template name="setAuthorityValueURIs">
+        <xsl:with-param name="classification">mir_genres</xsl:with-param>
+        <xsl:with-param name="category">journal</xsl:with-param>
+      </xsl:call-template>
+    </mods:genre>
+  </xsl:template>
+
+  <xsl:template name="setAuthorityValueURIs">
+    <xsl:param name="classification" />
+    <xsl:param name="category" />
+
+    <xsl:variable name="uri1"  select="concat('classification:metadata:1:children:',$classification)" />
+    <xsl:variable name="uri2" select="document($uri1)/*/label[@xml:lang='x-uri']/@text" />
+    <xsl:attribute name="authorityURI">
+      <xsl:value-of select="$uri2" />
+    </xsl:attribute>
+    <xsl:attribute name="valueURI">
+      <xsl:value-of select="$uri2" />
+      <xsl:text>#</xsl:text>
+      <xsl:value-of select="$category" />
+    </xsl:attribute>
+  </xsl:template>
+
+  <xsl:template match="journal-meta">
+    <mods:relatedItem type="host">
+      <xsl:call-template name="href" />
+      <xsl:call-template name="genre_journal" />
+      <xsl:apply-templates select="descendant::journal-title|descendant::abbrev-journal-title" />
+      <xsl:for-each select="../article-meta">
+        <mods:part>
+          <xsl:apply-templates select="volume" />
+          <xsl:apply-templates select="issue" />
+          <xsl:call-template name="pages" />
+        </mods:part>
+      </xsl:for-each>
+      <xsl:apply-templates select="issn" />
+      <xsl:call-template name="originInfo" />
+    </mods:relatedItem>
+  </xsl:template>
+
+  <xsl:param name="MCR.ContentTransformer.deepgreenjats2mods.HostRelation" select="'link'" />
+
+  <xsl:template name="href">
+    <xsl:if test="$MCR.ContentTransformer.deepgreenjats2mods.HostRelation='link'">
+      <xsl:variable name="solrQueryISSN">
+        <xsl:for-each select="issn">
+          <xsl:if test="not(position()=1)">
+            <xsl:text>+</xsl:text>
+          </xsl:if>
+          <xsl:value-of select="."/>
+        </xsl:for-each>
+      </xsl:variable>
+      <xsl:variable name="solrQuery"
+                    select="document(concat('solr:main:q=%2Bmods.identifier%3A%28', $solrQueryISSN, '%29%20AND%20%2Bmods.genre%3Ajournal'))" />
+      <xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink">
+        <xsl:choose>
+          <xsl:when test="$solrQuery/response/result/@numFound &gt; 0">
+            <xsl:value-of select="$solrQuery/response/result/doc[1]/str[@name='id']" />
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$MIR.projectid.default" />
+            <xsl:text>_mods_00000000</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="originInfo">
+    <xsl:if test="pub-date|publisher">
+      <mods:originInfo eventType="publication">
+        <xsl:call-template name="pub-date" />
+        <xsl:apply-templates select="publisher" />
+      </mods:originInfo>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="pages">
+    <xsl:if test="fpage|lpage">
+      <mods:extent unit="pages">
+        <xsl:apply-templates select="fpage|lpage" />
+      </mods:extent>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="fpage">
+    <mods:start>
+      <xsl:value-of select="." />
+    </mods:start>
+  </xsl:template>
+
+  <xsl:template match="lpage">
+    <mods:end>
+      <xsl:value-of select="." />
+    </mods:end>
+  </xsl:template>
+
+  <xsl:template match="article/@xml:lang" mode="lang2mods">
+    <mods:language>
+      <mods:languageTerm type="code" authority="rfc5646">
+        <xsl:value-of select="translate(.,$upperABC,$lowerABC)" />
+      </mods:languageTerm>
+    </mods:language>
+  </xsl:template>
+
+  <xsl:template match="@xml:lang">
+    <xsl:attribute name="xml:lang">
+      <xsl:value-of select="translate(.,$upperABC,$lowerABC)" />
+    </xsl:attribute>
+  </xsl:template>
+
+  <xsl:variable name="idTypes" select="document('classification:metadata:-1:children:identifier')//categories" />
+
+  <xsl:template match="article-id">
+    <!-- only import supported identifier types -->
+    <xsl:if test="$idTypes/category[@ID=current()/@pub-id-type]">
+      <mods:identifier type="{@pub-id-type}">
+        <xsl:value-of select="." />
+      </mods:identifier>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="title-group">
+    <mods:titleInfo>
+      <xsl:apply-templates select="article-title" />
+      <xsl:apply-templates select="subtitle" />
+    </mods:titleInfo>
+    <xsl:apply-templates select="trans-title-group" />
+  </xsl:template>
+
+  <xsl:template match="article-title">
+    <xsl:apply-templates select="@xml:lang" />
+    <xsl:if test="not(@xml:lang)">
+      <xsl:apply-templates select="/*/@xml:lang" />
+    </xsl:if>
+    <mods:title>
+      <xsl:value-of select="normalize-space(.)" />
+    </mods:title>
+  </xsl:template>
+
+  <xsl:template match="trans-title">
+    <xsl:apply-templates select="@xml:lang" />
+    <mods:title>
+      <xsl:value-of select="normalize-space(.)" />
+    </mods:title>
+  </xsl:template>
+
+  <xsl:template match="subtitle|trans-subtitle">
+    <mods:subTitle>
+      <xsl:value-of select="." />
+    </mods:subTitle>
+  </xsl:template>
+
+  <xsl:template match="trans-title-group">
+    <mods:titleInfo type="translated">
+      <xsl:apply-templates select="trans-title" />
+      <xsl:apply-templates select="trans-subtitle" />
+    </mods:titleInfo>
+  </xsl:template>
+
+  <!-- If no main title, use abbreviated title of type "full" as main title -->
+  <xsl:template match="journal-title|abbrev-journal-title[@abbrev-type='full'][not(../journal-title)]">
+    <mods:titleInfo>
+      <xsl:apply-templates select="@xml:lang" />
+      <mods:title>
+        <xsl:value-of select="normalize-space(.)" />
+      </mods:title>
+    </mods:titleInfo>
+  </xsl:template>
+
+  <!-- Ignore abbreviated title if same as main title -->
+  <xsl:template match="abbrev-journal-title[normalize-space(.)=normalize-space(../journal-title)]" priority="1" />
+
+  <xsl:template match="abbrev-journal-title">
+    <mods:titleInfo type="abbreviated">
+      <xsl:apply-templates select="@xml:lang" />
+      <mods:title>
+        <xsl:value-of select="normalize-space(.)" />
+      </mods:title>
+    </mods:titleInfo>
+  </xsl:template>
+
+  <xsl:template match="contrib">
+    <mods:name type="personal">
+      <xsl:for-each select="name|string-name">
+        <xsl:apply-templates select="surname" />
+        <xsl:apply-templates select="given-names" />
+        <xsl:apply-templates select="prefix|suffix" />
+      </xsl:for-each>
+      <xsl:call-template name="affiliation" />
+      <xsl:apply-templates select="@contrib-type" />
+      <xsl:apply-templates select="contrib-id" />
+    </mods:name>
+  </xsl:template>
+
+  <xsl:template match="surname">
+    <mods:namePart type="family">
+      <xsl:value-of select="." />
+    </mods:namePart>
+  </xsl:template>
+
+  <xsl:template match="given-names">
+    <mods:namePart type="given">
+      <xsl:value-of select="." />
+    </mods:namePart>
+  </xsl:template>
+
+  <xsl:template match="prefix|suffix">
+    <mods:namePart type="termsOfAddress">
+      <xsl:value-of select="." />
+    </mods:namePart>
+  </xsl:template>
+
+  <!-- Try to map contributor roles by comparing labels in marcrelator classification -->
+
+  <xsl:variable name="roles" select="document('classification:metadata:-1:children:marcrelator')/mycoreclass" />
+
+  <xsl:template match="@contrib-type">
+    <xsl:variable name="role" select="translate(.,$upperABC,$lowerABC)" />
+    <xsl:variable name="categoryID" select="$roles//category[label[translate(@text,$upperABC,$lowerABC)=$role]]/@ID" />
+
+    <mods:role>
+      <mods:roleTerm>
+        <xsl:choose>
+          <xsl:when test="string-length($categoryID) &gt; 0">
+            <xsl:attribute name="type">code</xsl:attribute>
+            <xsl:attribute name="authority">marcrelator</xsl:attribute>
+            <xsl:value-of select="$categoryID" />
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="type">text</xsl:attribute>
+            <xsl:value-of select="." />
+          </xsl:otherwise>
+        </xsl:choose>
+      </mods:roleTerm>
+    </mods:role>
+  </xsl:template>
+
+  <xsl:template name="affiliation">
+    <xsl:choose>
+      <!-- Link to affiliation via xref ID -->
+      <xsl:when test="xref[(@ref-type='aff') or not(@ref-type)][string-length(@rid) > 0]">
+        <xsl:apply-templates select="xref[(@ref-type='aff') or not(@ref-type)][string-length(@rid) > 0]" />
+      </xsl:when>
+      <!-- Affiliation is given at article level -->
+      <xsl:when test="not(xref[(@ref-type='aff') or not(@ref-type)])
+        and //article-meta/aff[not(@*)][position()=last()][string-length(text()[1]) > 0]">
+        <xsl:apply-templates select="//article-meta/aff[not(@*)][position()=last()][string-length(text()[1]) > 0]" />
+      </xsl:when>
+      <!-- Affiliation is given in aff ellement -->
+      <xsl:otherwise>
+        <xsl:apply-templates select="aff" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- Affiliations may be linked via @id/xref -->
+  <xsl:key name="rid2aff" match="//aff[@id]" use="@id" />
+
+  <xsl:template match="xref[(@ref-type='aff') or not(@ref-type)]">
+    <xsl:apply-templates select="key('rid2aff',@rid)" />
+  </xsl:template>
+
+  <xsl:template match="aff">
+    <mods:affiliation>
+      <xsl:apply-templates select="node()" mode="copy-affiliation" />
+    </mods:affiliation>
+  </xsl:template>
+  
+  <xsl:template match="text()" mode="copy-affiliation">
+    <xsl:value-of select="normalize-space(.)" />  
+  </xsl:template>
+  
+  <xsl:template match="break" mode="copy-affiliation">
+    <xsl:text> </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="named-content|institution|institution-wrap|postal-code|addr-line|city|country" mode="copy-affiliation">
+    <xsl:apply-templates select="node()" mode="copy-affiliation" />
+    <xsl:if test="following::*">
+      <xsl:text> </xsl:text>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="*" mode="copy-affiliation" />
+
+  <xsl:template match="contrib-id">
+    <mods:nameIdentifier type="{@contrib-id-type}">
+      <xsl:value-of select="." />
+    </mods:nameIdentifier>
+  </xsl:template>
+  
+  <xsl:variable name="orcidSite">orcid.org/</xsl:variable>
+
+  <!-- Reduce ORCID iDs given as complete URL -->
+  <xsl:template match="contrib-id[contains(.,$orcidSite)]" priority="1">
+    <xsl:variable name="orcid" select="substring-after(.,$orcidSite)"/>
+    <mods:nameIdentifier type="orcid">
+      <xsl:value-of select="$orcid" />
+    </mods:nameIdentifier>
+  </xsl:template>
+
+  <!-- Ignore empty ORCIDs -->
+  <xsl:template match="contrib-id[(normalize-space() = '')
+    or (contains(., $orcidSite) and normalize-space(substring-after(., $orcidSite)) = '')]" priority="2" />
+<!--  <xsl:template match="contrib-id[contains(.,$orcidSite)][normalize-space(substring-after(.,$orcidSite)) = '']" priority="2" />-->
+
+  <xsl:template name="pub-date">
+    <xsl:choose>
+      <xsl:when test="pub-date[(@pub-type='ppub') or ((@date-type='pub') and (@publication-format='print'))]">
+        <xsl:apply-templates select="pub-date[(@pub-type='ppub') or ((@date-type='pub') and (@publication-format='print'))][1]" />
+      </xsl:when>
+      <xsl:when test="pub-date[(@pub-type='epub') or ((@date-type='pub') and (@publication-format='electronic'))]">
+        <xsl:apply-templates select="pub-date[(@pub-type='epub') or ((@date-type='pub') and (@publication-format='electronic'))][1]" />
+      </xsl:when>
+      <xsl:when test="pub-date[(@pub-type='ppub') or (@date-type='pub')]">
+        <xsl:apply-templates select="pub-date[(@pub-type='ppub') or (@date-type='pub')][1]" />
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="pub-date[@iso-8601-date]">
+    <mods:dateIssued encoding="w3cdtf">
+      <xsl:value-of select="@iso-8601-date" />
+    </mods:dateIssued>
+  </xsl:template>
+
+  <xsl:template match="pub-date">
+    <mods:dateIssued encoding="w3cdtf">
+      <xsl:value-of select="year" />
+      <xsl:apply-templates select="month" />
+      <xsl:apply-templates select="day" />
+    </mods:dateIssued>
+  </xsl:template>
+
+  <xsl:template match="day|month">
+    <xsl:text>-</xsl:text>
+    <xsl:if test="string-length(.)=1">0</xsl:if>
+    <xsl:value-of select="." />
+  </xsl:template>
+
+  <xsl:template match="volume|issue">
+    <mods:detail type="{name()}">
+      <mods:number>
+        <xsl:value-of select="." />
+      </mods:number>
+    </mods:detail>
+  </xsl:template>
+
+  <xsl:template match="abstract[@type='toc']">
+    <mods:tableOfContents>
+      <xsl:apply-templates select="@xml:lang" />
+      <xsl:apply-templates select="*|text()" />
+    </mods:tableOfContents>
+  </xsl:template>
+
+  <xsl:template match="abstract|trans-abstract">
+    <mods:abstract>
+      <xsl:apply-templates select="@xml:lang" />
+      <xsl:apply-templates select="*|text()" />
+    </mods:abstract>
+  </xsl:template>
+
+  <xsl:template match="kwd-group/kwd">
+    <mods:subject>
+      <mods:topic>
+        <xsl:value-of select="." />
+      </mods:topic>
+    </mods:subject>
+  </xsl:template>
+
+  <xsl:template match="issn">
+    <mods:identifier type="issn">
+      <xsl:value-of select="." />
+    </mods:identifier>
+  </xsl:template>
+
+  <xsl:template match="publisher">
+    <xsl:apply-templates select="publisher-name" />
+    <xsl:apply-templates select="publisher-loc" />
+  </xsl:template>
+
+  <xsl:template match="publisher-name">
+    <mods:publisher>
+      <xsl:value-of select="." />
+    </mods:publisher>
+  </xsl:template>
+
+  <xsl:template match="publisher-loc">
+    <mods:place>
+      <mods:placeTerm type="text">
+        <xsl:value-of select="." />
+      </mods:placeTerm>
+    </mods:place>
+  </xsl:template>
+
+  <xsl:template match="permissions/copyright-statement">
+    <mods:accessCondition type="copyrightMD" xmlns:cmd="http://www.cdlib.org/inside/diglib/copyrightMD">
+      <cmd:copyright copyright.status="copyrighted" publication.status="published"
+        xsi:schemaLocation="http://www.cdlib.org/inside/diglib/copyrightMD https://www.cdlib.org/groups/rmg/docs/copyrightMD.xsd">
+        <cmd:rights.holder>
+          <cmd:name>
+            <xsl:value-of select="." />
+          </cmd:name>
+        </cmd:rights.holder>
+      </cmd:copyright>
+    </mods:accessCondition>
+  </xsl:template>
+
+  <!-- Map license URL to category in mir_licenses -->
+
+  <xsl:variable name="mir_licenses" select="document('classification:metadata:-1:children:mir_licenses')/mycoreclass" />
+  <xsl:variable name="mir_licenses_uri" select="$mir_licenses/label[@xml:lang='x-uri']/@text" />
+
+  <xsl:template match="permissions/license">
+    <xsl:variable name="url">
+      <xsl:choose>
+        <xsl:when test="@xlink:href">
+          <xsl:value-of select="substring-after(@xlink:href,'//')"/>
+        </xsl:when>
+        <xsl:when test="license-p/ext-link/@xlink:href">
+          <xsl:value-of select="substring-after(license-p/ext-link/@xlink:href,'//')"/>
+        </xsl:when>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="categoryID" select="$mir_licenses//category[url[contains(@xlink:href,$url)]]/@ID" />
+
+      <xsl:choose>
+        <xsl:when test="string-length($url) and (string-length($categoryID) &gt; 0)">
+        <mods:accessCondition type="use and reproduction">
+          <xsl:attribute name="xlink:href">
+            <xsl:value-of select="concat($mir_licenses_uri,'#',$categoryID)" />
+          </xsl:attribute>
+        </mods:accessCondition>
+        </xsl:when>
+        <xsl:otherwise>
+          <!-- Can not recognize license, use default license, and safe original license text -->
+          <mods:accessCondition type="use and reproduction" xlink:href="{$mir_licenses_uri}#oa_nlz" />
+          <mods:accessCondition type="use and reproduction">
+            <xsl:value-of select="license-p" />
+          </mods:accessCondition>
+        </xsl:otherwise>
+      </xsl:choose>
+  </xsl:template>
+
+  <!-- OA im Zuge einer National-/Allianz-Lizenz -->
+  <xsl:template name="oa_nlz">
+    <mods:accessCondition type="use and reproduction" xlink:href="{$mir_licenses_uri}#oa_nlz" />
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/sword/mycoreobject2dissemin-status.xsl b/mir-module/src/main/resources/xslt/sword/mycoreobject2dissemin-status.xsl
similarity index 100%
rename from mir-module/src/main/resources/xsl/sword/mycoreobject2dissemin-status.xsl
rename to mir-module/src/main/resources/xslt/sword/mycoreobject2dissemin-status.xsl
diff --git a/mir-module/src/main/resources/xsl/sword/ojsmets2mods.xsl b/mir-module/src/main/resources/xslt/sword/ojsmets2mods.xsl
similarity index 100%
rename from mir-module/src/main/resources/xsl/sword/ojsmets2mods.xsl
rename to mir-module/src/main/resources/xslt/sword/ojsmets2mods.xsl
diff --git a/mir-module/src/test/java/org/mycore/mir/acl/MIRACLTest.java b/mir-module/src/test/java/org/mycore/mir/acl/MIRACLTest.java
index ad167c04b0..7c001a8a6d 100644
--- a/mir-module/src/test/java/org/mycore/mir/acl/MIRACLTest.java
+++ b/mir-module/src/test/java/org/mycore/mir/acl/MIRACLTest.java
@@ -195,7 +195,7 @@ protected Map<String, String> getTestProperties() {
             "org.mycore.common.content.transformer.MCRXSLTransformer");
         testProperties.put("MCR.ContentTransformer.rules-helper.TransformerFactoryClass",
             "net.sf.saxon.TransformerFactoryImpl");
-        testProperties.put("MCR.ContentTransformer.rules-helper.Stylesheet", "xsl/rules-helper.xsl");
+        testProperties.put("MCR.ContentTransformer.rules-helper.Stylesheet", "xslt/rules-helper.xsl");
 
         testProperties.put("MCR.Access.Strategy.Class", "org.mycore.access.facts.MCRFactsAccessSystem");
         testProperties.put("MCR.Access.Class", "org.mycore.access.facts.MCRFactsAccessSystem");