Skip to content

MIR-1540 migrate xeditor files to saxon compatibility #1283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yagee-de merged 12 commits into from
Mar 13, 2026
Merged

MIR-1540 migrate xeditor files to saxon compatibility #1283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6ffc820
MIR-1540 migrate xeditor files to saxon compatibility
kkrebs Feb 25, 2026
f68edd7
MIR-1540 removed flavor and unneeded templates / includes
kkrebs Feb 27, 2026
0fccb16
MIR-1540 finish editor migration
kkrebs Feb 27, 2026
bcfb6ba
remove transformer spec
kkrebs Mar 11, 2026
a9080dc
MIR-1540 migrated mods2xeditor.xsl and xeditor2mods.xsl
yagee-de Mar 13, 2026
cfea7ad
MIR-1540 clean up xeditor-mir-templates.xsl
yagee-de Mar 13, 2026
ed6931c
MIR-1540 fixed review issues and added tests
yagee-de Mar 13, 2026
06ff8fd
MIR-1540 fixed more review issues and added more tests
yagee-de Mar 13, 2026
c5d76b8
MIR-1540 fixed regressions from 06ff8fd93461c59ef9c142d0e3ae4d287df6a17e
yagee-de Mar 13, 2026
0766dd0
MIR-1540 fix more issues
yagee-de Mar 13, 2026
ab0fcc0
MIR-1540 fix issue in derivate2xeditor.xsl
yagee-de Mar 13, 2026
9672255
MIR-1540 fixes more issues
yagee-de Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mir-module/src/main/resources/META-INF/resources/editor/change_genre.xed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<p>Bitte geben Sie das korrekte Genre für die Publikation xy an:</p>

<xed:form xmlns:xed="http://www.mycore.de/xeditor" role="form" class="form-horizontal">
<xed:source uri="xslStyle:mods2editor#xsl:xslStyle:asParent#xsl:mcrobject:{$parentId}" />
<xed:source uri="xslStyle:mods2editor#xsl:xslStyle:mycoreobject-editor#xsl:mcrobject:{$id}" />
<xed:source uri="xslStyle:mods2editor:xslStyle:asParent:mcrobject:{$parentId}" />
<xed:source uri="xslStyle:mods2editor:xslStyle:mycoreobject-editor:mcrobject:{$id}" />
<xed:cancel url="servlets/MCRLockServlet?action=unlock&amp;id={$id}&amp;url=/receive/{$id}" />
<xed:cancel url="{$from}" />
<xed:cancel url="../index.xml" />
Expand All @@ -21,7 +21,7 @@
</label>
<div class="col-md-6">
<select class="form-control form-control-inline form-select">
<xed:include uri="xslStyle:items2options#xslt:classification:editorComplete:1:children:mir_genres" />
<xed:include uri="xslStyle:items2options:classification:editorComplete:1:children:mir_genres" />
</select>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions mir-module/src/main/resources/META-INF/resources/editor/editor-admins.xed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

<xed:form xmlns:xed="http://www.mycore.de/xeditor" xmlns:cmd="http://www.cdlib.org/inside/diglib/copyrightMD" method="post" role="form" class="form-horizontal">

<xed:preload uri="xslStyle:editor/mir2xeditor#xsl:webapp:editor/editor-includes.xed" />
<xed:preload uri="xslStyle:editor/mir2xeditor#xsl:webapp:editor/editor-admins-includes.xed" />
<xed:preload uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-includes.xed" />
<xed:preload uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-admins-includes.xed" />
<xed:preload uri="{$MIR.EditorForms.CustomIncludes}" />

<xed:include ref="in.out" />
Expand Down
8 changes: 4 additions & 4 deletions mir-module/src/main/resources/META-INF/resources/editor/editor-derivate-includes.xed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<xed:template xmlns:xed="http://www.mycore.de/xeditor" xmlns:mir="http://www.mycore.de/mir">

<xed:template id="in.out">
<xed:source uri="notnull:checkPermissionChain:{$derivateid}:writedb:xslStyle:editor/derivate2xeditor#xsl:mcrobject:{$derivateid}" />
<xed:source uri="notnull:checkPermissionChain:{$derivateid}:writedb:xslStyle:editor/derivate2xeditor:mcrobject:{$derivateid}" />
<xed:cancel url="/receive/{$objectid}" />
<xed:cancel url="{$cancelUrl}" />
<xed:cancel url="../index.html" />
<xed:post-processor xsl="editor/xeditor2derivate.xsl" transformer="xalan" />
<xed:post-processor xsl="editor/xeditor2derivate.xsl" />
</xed:template>

<xed:template id="order">
Expand All @@ -27,7 +27,7 @@
<option value="">
<xed:output i18n="mir.select" />
</option>
<xed:include uri="xslStyle:items2options#xslt:classification:editorComplete:1:children:derivate_types" />
<xed:include uri="xslStyle:items2options:classification:editorComplete:1:children:derivate_types" />
</select>
</div>
</div>
Expand All @@ -45,7 +45,7 @@
<option value="">
<xed:output i18n="mir.select" />
</option>
<xed:include uri="xslStyle:items2options#xslt:classification:editorComplete:1:children:mir_access" />
<xed:include uri="xslStyle:items2options:classification:editorComplete:1:children:mir_access" />
</select>
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions mir-module/src/main/resources/META-INF/resources/editor/editor-derivate.xed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<xed:choose>
<xed:when test="xed:call-java('org.mycore.access.MCRAccessManager', 'checkPermission', $derivateid,'writedb')">
<xed:include uri="webapp:editor/editor-derivate-includes.xed" ref="in.out"/>
<xed:include uri="xslStyle:editor/mir2xeditor#xsl:webapp:editor/editor-derivate-includes.xed" ref="javascript"/>
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-derivate-includes.xed" ref="javascript"/>
<div class="panel panel-default">
<xed:bind xpath="/mycorederivate">
<div class="panel-heading">
Expand All @@ -20,12 +20,12 @@
</h1>
</div>
<div class="panel-body">
<xed:include uri="xslStyle:editor/mir2xeditor#xsl:webapp:editor/editor-derivate-includes.xed"
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-derivate-includes.xed"
ref="title_repeat"/>
<xed:include uri="xslStyle:editor/mir2xeditor#xsl:webapp:editor/editor-derivate-includes.xed" ref="order"/>
<xed:include uri="xslStyle:editor/mir2xeditor#xsl:webapp:editor/editor-derivate-includes.xed"
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-derivate-includes.xed" ref="order"/>
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-derivate-includes.xed"
ref="derivate_types"/>
<xed:include uri="xslStyle:editor/mir2xeditor#xsl:webapp:editor/editor-derivate-includes.xed"
<xed:include uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-derivate-includes.xed"
ref="mir_access"/>
<xed:include uri="webapp:editor/editor-derivate-includes.xed" ref="cancel.submit"/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion mir-module/src/main/resources/META-INF/resources/editor/editor-dynamic.xed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<xed:form xmlns:xed="http://www.mycore.de/xeditor" xmlns:cmd="http://www.cdlib.org/inside/diglib/copyrightMD" method="post" role="form" class="form-horizontal" id="dynamic_editor">

<xed:preload uri="xslStyle:editor/mir2xeditor#xsl:webapp:editor/editor-includes.xed" />
<xed:preload uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-includes.xed" />
<xed:preload uri="webapp:editor/editor-genres.xed" />
<xed:preload uri="webapp:editor/editor-hosts.xed" />
<xed:preload uri="{$MIR.EditorForms.CustomIncludes}" />
Expand Down
56 changes: 28 additions & 28 deletions mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version="1.0" encoding="UTF-8"?>

<xed:template xmlns:xed="http://www.mycore.de/xeditor" xmlns:mir="http://www.mycore.de/mir"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
Expand All @@ -8,18 +8,18 @@
<xsl:param name="MCR.Metadata.Languages" select="en"/>

<xed:template id="in.out">
<xed:source uri="xslStyle:import/remove-genres,import/mods2mycoreobject,editor/mods2xeditor#xsl:enrich:import:buildxml:_rootName_=mods:mods&amp;mods:identifier={$modsId}&amp;mods:identifier/@type={$type}" />
<xed:source uri="xslStyle:RDF-mods-journal,editor/mods2xeditor#xsl:http://ld.zdb-services.de/data/{$zdbid}.rdf" />
<xed:source uri="xslStyle:mycoreobject-editor,editor/mods2xeditor#xsl:mcrobject:{$id}" />
<xed:source uri="xslStyle:mycoreobject-copyof,editor/mods2xeditor#xsl:mcrobject:{$copyofid}" />
<xed:source uri="xslStyle:mods-addPreceding,mycoreobject-copyof,editor/mods2xeditor#xsl:mcrobject:{$oldVersion}" />
<xed:source uri="xslStyle:as{$relatedItemType},editor/mods2xeditor#xsl:mcrobject:{$relatedItemId}" />
<xed:source uri="xslStyle:import/remove-genres,import/mods2mycoreobject,editor/mods2xeditor:enrich:import:buildxml:_rootName_=mods:mods&amp;mods:identifier={$modsId}&amp;mods:identifier/@type={$type}" />
<xed:source uri="xslStyle:RDF-mods-journal,editor/mods2xeditor:http://ld.zdb-services.de/data/{$zdbid}.rdf" />
<xed:source uri="xslStyle:mycoreobject-editor,editor/mods2xeditor:mcrobject:{$id}" />
<xed:source uri="xslStyle:mycoreobject-copyof,editor/mods2xeditor:mcrobject:{$copyofid}" />
<xed:source uri="xslStyle:mods-addPreceding,mycoreobject-copyof,editor/mods2xeditor:mcrobject:{$oldVersion}" />
<xed:source uri="xslStyle:as{$relatedItemType},editor/mods2xeditor:mcrobject:{$relatedItemId}" />

<xed:cancel
url="../servlets/MCRLockServlet?action=unlock&amp;id={$id}&amp;url=/receive/{$id}?XSL.Status.Message=mir.editstatus.canceled&amp;XSL.Status.Style=danger" />
<xed:cancel url="{$cancelUrl}?XSL.Status.Message=mir.editstatus.canceled&amp;XSL.Status.Style=danger" />
<xed:cancel url="../index.html?XSL.Status.Message=mir.editstatus.canceled&amp;XSL.Status.Style=danger" />
<xed:post-processor class="org.mycore.mir.editor.MIRPostProcessor" xsl="editor/xeditor2mods.xsl" transformer="xalan" />
<xed:post-processor class="org.mycore.mir.editor.MIRPostProcessor" xsl="editor/xeditor2mods.xsl" />
</xed:template>

<xed:template id="mycore.common">
Expand Down Expand Up @@ -48,7 +48,7 @@
<option value="">
<xed:output i18n="mir.select" />
</option>
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:mir_genres" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_genres" />
</select>
</div>
</div>
Expand Down Expand Up @@ -125,7 +125,7 @@
<div class="col-md-6">
<div class="controls">
<select class="form-control form-control-inline form-select">
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:state" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:state" />
</select>
</div>
</div>
Expand Down Expand Up @@ -521,7 +521,7 @@
<xed:bind xpath="mods:name[@type='personal'][mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']='aut']" />
<xed:bind xpath="mods:name[@type='personal'][mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']='rev']" />
<mir:person.repeated help-text="{i18n:mir.help.thesis.advisor.reviewer}">
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:marcrelator" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:marcrelator" />
</mir:person.repeated>
</xed:template>

Expand Down Expand Up @@ -561,19 +561,19 @@

<xed:template id="name.repeated">
<mir:person.repeated help-text="{i18n:mir.help.name.repeated}">
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:marcrelator" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:marcrelator" />
</mir:person.repeated>
</xed:template>

<xed:template id="name.extended.repeated">
<mir:person.extended.repeated help-text="{i18n:mir.help.name.repeated}">
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:marcrelator" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:marcrelator" />
</mir:person.extended.repeated>
</xed:template>

<xed:template id="name.extended.full.repeated">
<mir:person.extended.repeated help-text="{i18n:mir.help.name.repeated}" authorSpecification="true">
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:marcrelator" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:marcrelator" />
</mir:person.extended.repeated>
</xed:template>

Expand Down Expand Up @@ -665,7 +665,7 @@
<option value="">
<xed:output i18n="mir.select.optional" />
</option>
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:author_roles" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:author_roles" />
</select>
</xed:bind>
</div>
Expand Down Expand Up @@ -722,7 +722,7 @@
<xed:bind xpath="@type" name="type">
<div class="col-md-3">
<select class="form-control nameIdentifierType form-select" style="text-align:right; font-weight:bold;">
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:nameIdentifier" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:nameIdentifier" />
<xed:load-resource name="identifier" uri="classification:metadata:-1:children:nameIdentifier" />
<xed:if test="not($identifier//category[@ID=$type]) and not($type='')">
<option value="{$type}" selected="">
Expand Down Expand Up @@ -1087,7 +1087,7 @@
<div class="col-md-3" style="text-align:right; font-weight:bold;">
<xed:bind xpath="@type" name="type">
<select class="form-control identifierSelect form-select">
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:identifier" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:identifier" />
<xed:load-resource name="identifier" uri="classification:metadata:-1:children:identifier" />
<xed:if test="not($identifier//category[@ID=$type]) and not($type='')">
<option value="{$type}" selected="">
Expand Down Expand Up @@ -1322,7 +1322,7 @@
</label>
<div class="col-md-6">
<select class="form-control form-control-inline form-select">
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:mir_filetype" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_filetype" />
</select>
</div>
<mir:help-pmud help-text="{i18n:mir.help.physical.description.form}" />
Expand Down Expand Up @@ -1435,7 +1435,7 @@
<!-- fix XEditor crash -->
<!-- <xed:template id="lang.list.addon"> -->
<!-- <select class="form-control form-control-inline input-group-addon form-select"> -->
<!-- <xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:rfc5646" /> -->
<!-- <xed:include uri="xslStyle:items2options:classification:editor:-1:children:rfc5646" /> -->
<!-- </select> -->
<!-- </xed:template> -->

Expand All @@ -1448,7 +1448,7 @@
<div class="col-md-6">
<div class="controls">
<select class="form-control form-control-inline form-select">
<xed:include uri="xslStyle:items2options#xslt:classification:editorComplete:1:children:typeOfResource" />
<xed:include uri="xslStyle:items2options:classification:editorComplete:1:children:typeOfResource" />
</select>
</div>
</div>
Expand All @@ -1467,7 +1467,7 @@
<div class="controls">
<xed:bind xpath="@mcr:categId">
<select class="form-control form-control-inline form-select">
<xed:include uri="xslStyle:items2options#xslt:classification:editorComplete:1:children:typeOfResource" />
<xed:include uri="xslStyle:items2options:classification:editorComplete:1:children:typeOfResource" />
</select>
</xed:bind>
</div>
Expand Down Expand Up @@ -1507,7 +1507,7 @@
<option value="">
<xed:output i18n="mir.select" />
</option>
<xed:include uri="xslStyle:license-filter,items2options?genre={$genre_intern}#xslt:classification:editor:-1:children:mir_licenses" />
<xed:include uri="xslStyle:license-filter,items2options?genre={$genre_intern}:classification:editor:-1:children:mir_licenses" />
</select>
</div>
<mir:help-pmud help-text="{i18n:mir.help.rights}" />
Expand All @@ -1529,7 +1529,7 @@
<option value="">
<xed:output i18n="mir.select.optional" />
</option>
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:mir_access" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_access" />
</select>
</div>
<mir:help-pmud help-text="{i18n:mir.help.access}" />
Expand Down Expand Up @@ -1571,7 +1571,7 @@
<option value="">
<xed:output i18n="mir.select.optional" />
</option>
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:mir_institutes" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_institutes" />
</select>
</xed:bind>
</xed:bind>
Expand Down Expand Up @@ -1662,7 +1662,7 @@
<option value="">
<xed:output i18n="mir.select" />
</option>
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:SDNB" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:SDNB" />
</select>
</div>
<mir:help-pmud help-text="{i18n:mir.help.sdnb}" />
Expand All @@ -1684,7 +1684,7 @@
<option value="">
<xed:output i18n="mir.select" />
</option>
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:SDNB" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:SDNB" />
</select>
</div>
<mir:help-pmud help-text="{i18n:mir.help.sdnb}" pmud="true" />
Expand Down Expand Up @@ -2152,7 +2152,7 @@
<option value="">
<xed:output i18n="mir.select"/>
</option>
<xed:include uri="xslStyle:items2options,fix-classification-options#xslt:classification:editor:-1:children:noteTypes" />
<xed:include uri="xslStyle:items2options,fix-classification-options:classification:editor:-1:children:noteTypes" />
</select>
</xed:bind >
</div>
Expand Down Expand Up @@ -2242,7 +2242,7 @@
<div class="col-md-3">
<xed:bind xpath="@otherType">
<select class="form-control form-select">
<xed:include uri="xslStyle:items2options#xslt:classification:editor:-1:children:mir_relateditem" />
<xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_relateditem" />
</select>
</xed:bind>
</div>
Expand Down
Loading
Loading