Skip to content

merge 2026.06.x into main#1397

Merged
sebhofmann merged 14 commits into
mainfrom
2026.06.x
Jun 19, 2026
Merged

merge 2026.06.x into main#1397
sebhofmann merged 14 commits into
mainfrom
2026.06.x

Conversation

@kkrebs

@kkrebs kkrebs commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

No description provided.

sebhofmann and others added 14 commits June 17, 2026 11:17
* MIR-1599 make submission workflow extensible via xslImport chain

mir-workflow.xsl was both the workflow entry point and the only member of
the mirworkflow import chain, importing the chain with its own self name.
That only pulls in entries before itself, so stylesheets appended by
overlays were never imported and their template overrides never loaded.
The empty creatorSubmittedAdd/editorReviewAdd defaults (priority 10) in
the entry point additionally blocked any override via import precedence.

Split the entry point from the base of the chain:
- add mir-workflow-hook.xsl as the chain base holding the empty default
  creatorSubmittedAdd/editorReviewAdd extension points
- point MCR.URIResolver.xslImports.mirworkflow at the hook
- import xslImport:mirworkflow (no self) in mir-workflow.xsl so it becomes
  a pure consumer that pulls in the top of the chain
- remove the empty extension-point templates from mir-workflow.xsl

Overlays can now append a stylesheet to the mirworkflow chain and override
the extension points.

* fix: add newline at end of mir-workflow-hook.xsl
The Sherpa Romeo API is deprecated; switch the proxy to the Open Policy
Finder endpoint and authenticate via the x-api-key header instead of the
api-key query parameter. Also URL-encode the filter query parameter to
fix the URISyntaxException on the '[' character.
* refactor: includes and parameters

* chore: copy basket-objects.xsl to xslt

* chore: make basket-objects.xsl saxon compatible

* chore: migrate to xsl 3 and improve code

* chore: delete obsolete xsl/basket-objects.xsl

* fix: mycoreobject-solrdocument uri
…mods2dc

- genre -> dc:type now de-duplicates per distinct value via a small
  genre-type helper function, so the intern genre and the mapped marcgt
  genre no longer yield duplicate dc:type. The shared mods:genre template
  is kept and used by both the DC export and the OAI export
  (mods2oai_dc.xsl includes this stylesheet and applies mods:genre).
- drop the enhancer-added receive URL identifier in the DC export, which
  was emitted both explicitly and again via the type='uri' identifier.
* chore: copy mir-oricd.xsl to xslt

* make mir-orcid.xsl saxon compatible

* remove obsolete orcid xsl

* refactor: mirorcidutil and improve code
* chore: copy as*.xsl to xslt

* chore: migrate as*.xsl to xsl 3

* chore: delete obsolte as+.xsl

* fix: related action menu items
* MIR-1570 fix datepicker and added test

* MIR-1570 fix clear date

* MIR-1570 add test to checkMetadataPage()

---------

Co-authored-by: Thomas Scheffler <github@yagee.de>
* origin/2023.06.x:
  MIR-1610 Fix workflow editorReview being displayed only in debug mode (#1404)
  MIR-1589 use Open Policy Finder API and URL-encode Sherpa filter
  MIR-1599 make submission workflow extensible via xslImport chain (#1392)
* origin/2024.06.x:
  MIR-1610 Fix workflow editorReview being displayed only in debug mode (#1404)
  Merge MIR-1570 into 2024.06.x (#1395)
  MIR-1589 use Open Policy Finder API and URL-encode Sherpa filter
  MIR-1599 make submission workflow extensible via xslImport chain (#1392)
* origin/2025.06.x:
  MIR-1610 Fix workflow editorReview being displayed only in debug mode (#1404)
  Merge MIR-1570 into 2024.06.x (#1395)
  MIR-1589 use Open Policy Finder API and URL-encode Sherpa filter
  MIR-1599 make submission workflow extensible via xslImport chain (#1392)
* origin/2025.12.x:
  MIR-1610 Fix workflow editorReview being displayed only in debug mode (#1404)
  Merge MIR-1570 into 2024.06.x (#1395)
  MIR-1589 use Open Policy Finder API and URL-encode Sherpa filter
  MIR-1599 make submission workflow extensible via xslImport chain (#1392)
@sebhofmann sebhofmann merged commit 14c5f29 into main Jun 19, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants