Skip to content

Commit 64bfb90

Browse files
sebhofmannsebhofmann
authored
Merge branch '2025.06.x' into 2025.12.x (#47)
Merge branch `2025.06.x` into `2025.12.x` ## Commits * 83eb9ca Merge branch '2024.06.x' into 2025.06.x (#43) * 5dd9da9 Merge branch '2023.06.x' into 2024.06.x (#44) * 72bd85d REP-1094 improve error page (#45) * 2e31b52 REP-1106 Add common URN OAI set configuration (#46) * 37ca5c3 REP-1106 Add common URN OAI set configuration * df02ffc fix: 403 case * 8a9ef92 feat: add 401 case * f09ab6d fix: punctuation * 36de625 chore: remove rfc5646 classification * e678df4 feat: introduce production mode * f1d4609 feat: use error template default * 353e414 chore: delete obsolete properties analyze (#41) * 2713e65 REP-1095 add e-mail-contact.xsl * 11944be Merge remote-tracking branch 'origin/2023.06.x' into 2024.06.x * 151df88 REP-1094 fix and improve error page
2 parents b37707b + 83eb9ca commit 64bfb90

8 files changed

Lines changed: 84 additions & 401 deletions

File tree

‎src/main/resources/META-INF/resources/oai/set_urn.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ListSets
3+
xmlns="http://www.openarchives.org/OAI/2.0/"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
6+
<set>
7+
<setSpec>urn</setSpec>
8+
<setName>Published objects with URN</setName>
9+
</set>
10+
</ListSets>

‎src/main/resources/classifications/rfc5646.xml‎

Lines changed: 0 additions & 224 deletions
This file was deleted.

‎src/main/resources/config/reposis_common/messages_de.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ project.form.agreement.accept.link=Einverst\u00E4ndniserkl\u00E4rung
1818
project.form.agreement=Einverst\u00E4ndniserkl\u00E4rung
1919
project.form.validation.agreement=Sie m\u00FCssen der Einverst\u00E4ndniserkl\u00E4rung zustimmen.
2020

21+
rep.contactMail.subjectPrefix=[Kontaktformular]
2122
rep.editor.codemeta.applicationCategory.help=Kategorische Einordnung der Anwendung (z.B. Spiel, Multimedia).
2223
rep.editor.codemeta.applicationSubCategory.help=Einordnung der Anwendung in eine Unterkategorie (z.B. Arcade Game).
2324
rep.editor.codemeta.buildInstructions.help=Link zur Installationsanleitung/Dokumentation.

‎src/main/resources/config/reposis_common/messages_en.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ project.form.agreement.accept.link=consent form
2020
project.form.agreement=consent form
2121
project.form.validation.agreement=You have to accept the consent form to continue.
2222

23+
rep.contactMail.subjectPrefix=[Contact Form]
2324
rep.editor.codemeta.applicationCategory.help=Type of software application, e.g. Game, Multimedia.
2425
rep.editor.codemeta.applicationSubCategory.help=Subcategory of the application, e.g. Arcade Game.
2526
rep.editor.codemeta.buildInstructions.help=Link to installation instructions/documentation.

‎src/main/resources/config/reposis_common/mycore.properties‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ MCR.CLI.Classes.External=%MCR.CLI.Classes.External%,de.gbv.reposis.metrics.MCRMO
2424
# MCR.MODS.Metrics.Provider.Scopus=de.gbv.reposis.metrics.scopus.MCRScopusMetricsProvider
2525
# MCR.MODS.Metrics.Provider.WebOfScience=de.gbv.reposis.metrics.wos.MCRWOSMetricsProvider
2626

27-
##############################################################################
28-
# Properties Helper #
29-
##############################################################################
30-
MCR.ContentTransformer.properties-analyze-xsl.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
31-
MCR.ContentTransformer.properties-analyze-xsl.Stylesheet=xsl/properties-analyze.xsl
32-
MCR.ContentTransformer.properties-analyze.Class=org.mycore.common.content.transformer.MCRTransformerPipe
33-
MCR.ContentTransformer.properties-analyze.Steps=properties-analyze-xsl,DefaultStep
34-
3527
##############################################################################
3628
# GeoSearch #
3729
##############################################################################
@@ -85,10 +77,19 @@ MCR.Servlet.LDAPLoginServlet.Disabled=true
8577
MCRLDAPConnectionSettings.Default.ConnectTimeout=5000
8678
MCRLDAPConnectionSettings.Default.ReadTimeout=5000
8779

80+
##############################################################################
81+
# OAI #
82+
##############################################################################
83+
# URN set
84+
MCR.OAIDataProvider.OAI2.Sets.urn.URI=webapp:oai/set_urn.xml
85+
MCR.OAIDataProvider.OAI2.Sets.urn.Query=mods.identifier.type.urn:* AND state:published
86+
#MCR.OAIDataProvider.OAI2.Sets=%MCR.OAIDataProvider.OAI2.Sets%,urn
87+
8888
##############################################################################
8989
# Frontend #
9090
##############################################################################
9191
# Error Page
92+
MCR.URIResolver.xslIncludes.ErrorPage=
9293
REP.ErrorPage.Mail.General=reposis-otrs@gbv.de
9394
REP.ErrorPage.Mail.Technical=reposis-otrs@gbv.de
9495

@@ -117,6 +118,7 @@ MCR.URIResolver.ModuleResolver.codemeta2rdf=de.gbv.reposis.codemeta.CodeMetaRDFU
117118
##############################################################################
118119
# Defaults #
119120
##############################################################################
121+
REP.ProductionMode=false
120122
# MIR.testEnvironment is currently used in MIR to enable facets in the search results.
121123
# Since this functionality is obsolete, the feature should be disabled entirely by default.
122124
MIR.testEnvironment=false

‎src/main/resources/xsl/e-mail-contact.xsl‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<xsl:stylesheet version="1.0"
3+
xmlns:mcri18n="xalan://org.mycore.services.i18n.MCRTranslation"
4+
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
5+
exclude-result-prefixes="mcri18n">
6+
7+
<xsl:output method="xml" encoding="UTF-8" />
8+
9+
<xsl:param name="MCR.mir-module.EditorMail" />
10+
11+
<xsl:template match="/contactMail">
12+
<xsl:if test="approvement='true'">
13+
<email>
14+
<from>
15+
<xsl:value-of select="concat(to_name, '&lt;', to_mail, '&gt;')" />
16+
</from>
17+
<to>
18+
<xsl:value-of select="$MCR.mir-module.EditorMail" />
19+
</to>
20+
<bcc>
21+
<xsl:value-of select="concat(to_name, '&lt;', to_mail, '&gt;')" />
22+
</bcc>
23+
<subject>
24+
<xsl:value-of select="concat(mcri18n:translate('rep.contactMail.subjectPrefix'), ' ', subject)" />
25+
</subject>
26+
<body>
27+
<xsl:value-of select="body" />
28+
</body>
29+
</email>
30+
</xsl:if>
31+
</xsl:template>
32+
33+
</xsl:stylesheet>

0 commit comments

Comments
 (0)