Merge branch 'r2024.08.13'

ThULB · Aug 13, 2024 · fbee4bc · fbee4bc
2 parents 6601ff1 + 2be3ddf
commit fbee4bc
Show file tree

Hide file tree

Showing 36 changed files with 613 additions and 234 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## 2024.08.13
+- [#572](https://github.com/ThULB/ThUniBib/issues/572) Added solr fields accessrights and peerreviewed to UBO.Export.Fields (#573)
+- [#574](https://github.com/ThULB/ThUniBib/issues/574) Overwrite i18n ubo.person.connected.sup for Ilmenau and Jena (#575)
+- [#576](https://github.com/ThULB/ThUniBib/issues/576) Added information about author icons to faq.xml (Ilmenau) (#577)
+- [#578](https://github.com/ThULB/ThUniBib/issues/578) Configured PPN2DBT-ID enrichment (#579)
+- [#580](https://github.com/ThULB/ThUniBib/issues/580) Do not map publications of type "others" to all possible orcid types (#581)
+- [#582](https://github.com/ThULB/ThUniBib/issues/582) Overwrite i18n ubo.person.connected.sup (Erfurt) (#583)
+- [#586](https://github.com/ThULB/ThUniBib/issues/586) Fixed property MCR.MODS.EnrichmentResolver.DataSources.scopusImport (prepend missing % character) (#587)
+- [#591](https://github.com/ThULB/ThUniBib/issues/591) Update index.xed (#590) (#592)
+- [#596](https://github.com/ThULB/ThUniBib/issues/596) Update .*xml files (Ilmenau) (#597)
+- [#606](https://github.com/ThULB/ThUniBib/issues/606) Updated privacy statement (Weimar) (#607)
+- [FSU040THUL-3958](https://servicedesk.uni-jena.de/plugins/servlet/desk/portal/140/FSU040THUL-3958) [#584](https://github.com/ThULB/ThUniBib/issues/584) Reflect changes as in [UBO-348](https://mycore.atlassian.net/browse/UBO-348) (#585)
+- [FSU040THUL-4069](https://servicedesk.uni-jena.de/plugins/servlet/desk/portal/140/FSU040THUL-4069) [#598](https://github.com/ThULB/ThUniBib/issues/598) Map thesis to dissertation during import from k10+ (Weimar) (#599)
+- [FSU040THUL-4078](https://servicedesk.uni-jena.de/plugins/servlet/desk/portal/140/FSU040THUL-4078) [#588](https://github.com/ThULB/ThUniBib/issues/588) Fork mycoreobject-e-mail.xsl from UBO (#589)
+- [FSU040THUL-4123](https://servicedesk.uni-jena.de/plugins/servlet/desk/portal/140/FSU040THUL-4123) [#601](https://github.com/ThULB/ThUniBib/issues/601) Added "f.year.facet.limit":-1 (no limit) to request handler configurations in solr-config.json (#603)
+---
+
 ## 2024.07.09
 - [#545](https://github.com/ThULB/ThUniBib/issues/545) Added flags indicating current language as svg graphics (#546)
 - [#548](https://github.com/ThULB/ThUniBib/issues/548) [FSU040THUL-3594](https://servicedesk.uni-jena.de/plugins/servlet/desk/portal/140/FSU040THUL-3594) Use gvk for imports by ISBN (#549)

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.uni-jena.thulb.ubo</groupId>
     <artifactId>ThUniBib</artifactId>
-    <version>2024.07.09</version>
+    <version>2024.08.13</version>
   </parent>
 
   <artifactId>thunibib-common</artifactId>

diff --git a/common/src/main/resources/META-INF/resources/edit-admin.xed b/common/src/main/resources/META-INF/resources/edit-admin.xed
@@ -137,6 +137,7 @@
           <xed:include uri="webapp:import-editor.xed" ref="fix.structure.parent" />
           <xed:include uri="webapp:import-editor.xed" ref="cleanup" />
           <xed:include uri="webapp:import-editor.xed" ref="cancel.submit" />
+          <xed:include uri="webapp:import-editor.xed" ref="javascript" />
         </xed:template>
       </xed:form>
     </div>

diff --git a/common/src/main/resources/META-INF/resources/edit-publication.xed b/common/src/main/resources/META-INF/resources/edit-publication.xed
@@ -126,6 +126,7 @@
           </xed:bind>
           <xed:include ref="cleanup" />
           <xed:include ref="cancel.submit" />
+          <xed:include ref="javascript" />
         </xed:template>
       </xed:form>
     </div>

diff --git a/common/src/main/resources/META-INF/resources/import-editor.xed b/common/src/main/resources/META-INF/resources/import-editor.xed
@@ -66,6 +66,10 @@
     </script>
   </xed:template>
 
+  <xed:template id="javascript">
+    <script src="{$WebApplicationBaseURL}js/language-search.js"/>
+  </xed:template>
+
   <xed:template id="common.metafields">
     <xed:bind xpath="@ID" default="{$UBO.projectid.default}_mods_00000000"/>
     <xed:bind xpath="@label" default="{$UBO.projectid.default}"/>
@@ -271,15 +275,10 @@
           </xed:bind>
           <span class="mx-2 align-self-center">in</span>
           <xed:bind xpath="@xml:lang">
-            <select class="autocomplete mycore-form-input-double custom-select">
-              <option value="">
-                <xed:output i18n="search.select"/>
-              </option>
-              <xed:include uri="xslStyle:items2options:classification:editor:0:parents:rfc5646:de"/>
-              <xed:include uri="xslStyle:items2options:classification:editor:0:parents:rfc5646:en"/>
-              <xed:include uri="xslStyle:items2options:classification:editor:0:parents:rfc5646:fr"/>
-              <xed:include uri="xslStyle:items2options:classification:editor:-1:children:rfc5646"/>
-            </select>
+            <div class="language-search d-inline" data-preferred-languages="de,en,fr">
+              <input id="{xed:generate-id(..)}" type="hidden" class="language-search-input"/>
+              <!-- content is added by javascript -->
+            </div>
           </xed:bind>
         </div>
         <xed:controls/>
@@ -841,15 +840,10 @@
           <xed:output value="concat(i18n:translate('ubo.language'), ': ')"/>
         </label>
         <xed:bind xpath="mods:languageTerm[@type='code'][@authority='rfc5646']">
-          <select id="{xed:generate-id(..)}" class="autocomplete mycore-form-input custom-select">
-            <option value="">
-              <xed:output i18n="search.select"/>
-            </option>
-            <xed:include uri="xslStyle:items2options:classification:editor:0:parents:rfc5646:de"/>
-            <xed:include uri="xslStyle:items2options:classification:editor:0:parents:rfc5646:en"/>
-            <xed:include uri="xslStyle:items2options:classification:editor:0:parents:rfc5646:fr"/>
-            <xed:include uri="xslStyle:items2options:classification:editor:-1:children:rfc5646"/>
-          </select>
+          <div class="language-search" data-preferred-languages="de,en,fr">
+            <input id="{xed:generate-id()}" type="hidden" class="language-search-input"/>
+            <!-- content is added by javascript -->
+          </div>
         </xed:bind>
         <xed:controls/>
       </div>
@@ -863,15 +857,10 @@
           <label for="{xed:generate-id()}" class="mycore-form-label">
             <xed:output value="concat(i18n:translate('ubo.abstract.in'), ': ')"/>
           </label>
-          <select class="autocomplete mycore-form-input custom-select">
-            <option value="">
-              <xed:output i18n="search.select"/>
-            </option>
-            <xed:include uri="xslStyle:items2options:classification:editor:0:parents:rfc5646:de"/>
-            <xed:include uri="xslStyle:items2options:classification:editor:0:parents:rfc5646:en"/>
-            <xed:include uri="xslStyle:items2options:classification:editor:0:parents:rfc5646:fr"/>
-            <xed:include uri="xslStyle:items2options:classification:editor:-1:children:rfc5646"/>
-          </select>
+          <div class="language-search" data-preferred-languages="de,en,fr">
+            <input id="{xed:generate-id()}" type="hidden" class="language-search-input"/>
+            <!-- content is added by javascript -->
+          </div>
         </xed:bind>
         <xed:controls/>
       </div>

diff --git a/common/src/main/resources/config/thunibib-common/messages_de.properties b/common/src/main/resources/config/thunibib-common/messages_de.properties
@@ -47,6 +47,12 @@ thunibib.editor.label.published.in              = erschienen in
 thunibib.editor.label.references                = Verweise
 thunibib.editor.label.republication             = Zweitver\u00F6ffentlichung
 thunibib.editor.references.select               = Verweis ausw\u00E4hlen
+thunibib.faq.icon.fa.user                       = F\u00FCr die Person liegen eindeutige Identifikatoren vor.
+thunibib.faq.icon.fa.user.edit                  = F\u00FCr die Person liegen eindeutige Identifikatoren vor. Die Person ist zudem eine korrespondierende Autorin oder ein korrespondierender Autor.
+thunibib.faq.icon.fa.user.edit.sup              = Die Person ist der Hochschule zugeordnet und f\u00FCr die Person liegen eindeutige Identifikatoren vor. Die Person ist zudem eine korrespondierende Autorin oder ein korrespondierender Autor.
+thunibib.faq.icon.fa.user.sup                   = Die Person ist der Hochschule zugeordnet und f\u00FCr die Person liegen eindeutige Identifikatoren vor.
+thunibib.faq.icon.headline                      = Was bedeuten die verschiedenen Icons neben den Namen der Personen?
+thunibib.faq.icon.not.present                   = Erscheint kein Icon neben dem Namen der Person, liegen keine weiteren Informationen vor.
 thunibib.funding.type                           = F\u00F6rderungstyp
 thunibib.servicedesk.default.summary            = Anfrage zu
 thunibib.signIn                                 = Anmelden

diff --git a/common/src/main/resources/config/thunibib-common/messages_en.properties b/common/src/main/resources/config/thunibib-common/messages_en.properties
@@ -51,6 +51,12 @@ thunibib.editor.label.published.in              = published in
 thunibib.editor.label.references                = References
 thunibib.editor.label.republication             = Second publishing
 thunibib.editor.references.select               = Choose reference
+thunibib.faq.icon.fa.user                       = There are unique identifiers for the person.
+thunibib.faq.icon.fa.user.edit                  = There are unique identifiers for the person. The person is also the corresponding author.
+thunibib.faq.icon.fa.user.edit.sup              = The person is assigned to the university and unique identifiers are available for the person. The person is also the corresponding author.
+thunibib.faq.icon.fa.user.sup                   = The person is assigned to the university and unique identifiers are available for the person.
+thunibib.faq.icon.headline                      = What do the different person icons next to the authors\u2019 names mean?
+thunibib.faq.icon.not.present                   = If no icon appears next to the person's name, no further information is available.
 thunibib.servicedesk.default.summary            = Inquiry to
 thunibib.signIn                                 = #
 thunibib.signOut                                = Sign out

diff --git a/common/src/main/resources/config/thunibib-common/mycore.properties b/common/src/main/resources/config/thunibib-common/mycore.properties
@@ -27,20 +27,24 @@ MCR.EventHandler.MCRObject.100.Class    = org.mycore.solr.index.MCRSolrIndexEven
 MCR.CLI.Classes.External.ThUniBibEnrich=de.uni_jena.thunibib.impex.EnrichmentByAffiliationCommands
 MCR.CLI.Classes.External.ThUniBib=de.uni_jena.thunibib.ThUniBibCommands
 
-MCR.MODS.EnrichmentResolver.DataSource.DBT.IdentifierTypes=dbt
-MCR.MODS.EnrichmentResolver.DataSource.DBT.dbt.URI=xslStyle:import/dbt2mods:https://www.db-thueringen.de/receive/{0}?XSL.Style=xml
-MCR.MODS.EnrichmentResolver.DataSource.GBV.isbn.URI=xslTransform:pica2mods:ratelimit:GBV:https://sru.k10plus.de/gvk?version=1.1&operation=searchRetrieve&query=pica.isb%3D{1}&maximumRecords=1&recordSchema=picaxml
+MCR.MODS.EnrichmentResolver.DataSource.PPN2DBT-ID.IdentifierTypes = ppn
+MCR.MODS.EnrichmentResolver.DataSource.PPN2DBT-ID.ppn.URI         = xslStyle:import/ppn2dbt-id:https://www.db-thueringen.de/servlets/solr/select?q=mods.identifier%3A*{0}&XSL.Style=xml
+
+MCR.MODS.EnrichmentResolver.DataSource.DBT.IdentifierTypes        = dbt
+MCR.MODS.EnrichmentResolver.DataSource.DBT.dbt.URI                = xslStyle:import/dbt2mods:https://www.db-thueringen.de/receive/{0}?XSL.Style=xml
+MCR.MODS.EnrichmentResolver.DataSource.GBV.isbn.URI               = xslTransform:pica2mods:ratelimit:GBV:https://sru.k10plus.de/gvk?version=1.1&operation=searchRetrieve&query=pica.isb%3D{1}&maximumRecords=1&recordSchema=picaxml
 
 # Overwrite Scopus-Import from UBO
-ThUniBib.Scopus.XSL=import/thunibib-scopus2mods,import/thunibib-genre2genre
-MCR.MODS.EnrichmentResolver.DataSources.withScopus=(GBV CrossRef DataCite) DBT Scopus (PubMed IEEE arXiv) Unpaywall ZDB JOP
-MCR.MODS.EnrichmentResolver.DataSources.withoutScopus=(GBV CrossRef DataCite) DBT (PubMed IEEE arXiv) Unpaywall ZDB JOP
-MCR.MODS.EnrichmentResolver.DataSources.import=%MCR.MODS.EnrichmentResolver.DataSources.withoutScopus%
-MCR.MODS.EnrichmentResolver.DataSources.scopusImport=%MCR.MODS.EnrichmentResolver.DataSources.withoutScopus%
-MCR.MODS.EnrichmentResolver.DataSource.Scopus.doi.URI=xslStyle:%ThUniBib.Scopus.XSL%:%UBO.Scopus.API.URL%abstract/doi/{0}?apikey=%UBO.Scopus.API.Key%
-MCR.MODS.EnrichmentResolver.DataSource.Scopus.scopus.URI=xslStyle:%ThUniBib.Scopus.XSL%:%UBO.Scopus.API.URL%abstract/scopus_id/{0}?apikey=%UBO.Scopus.API.Key%
-MCR.MODS.EnrichmentResolver.DataSources.scopus-import=Unpaywall GBV ZDB JOP
-UBO.Scopus.Importer.ImportURI=xslStyle:mods2mycoreobject:enrich:scopus-import:xslStyle:%ThUniBib.Scopus.XSL%,%UBO.SupportedMODSFilterName%:%UBO.Scopus.Importer.ImportURI.Scopus%
+ThUniBib.Scopus.XSL                                      = import/thunibib-scopus2mods,import/thunibib-genre2genre
+MCR.MODS.EnrichmentResolver.DataSource.Scopus.doi.URI    = xslStyle:%ThUniBib.Scopus.XSL%:%UBO.Scopus.API.URL%abstract/doi/{0}?apikey=%UBO.Scopus.API.Key%
+MCR.MODS.EnrichmentResolver.DataSource.Scopus.scopus.URI = xslStyle:%ThUniBib.Scopus.XSL%:%UBO.Scopus.API.URL%abstract/scopus_id/{0}?apikey=%UBO.Scopus.API.Key%
+MCR.MODS.EnrichmentResolver.DataSources.import           = %MCR.MODS.EnrichmentResolver.DataSources.withoutScopus%
+MCR.MODS.EnrichmentResolver.DataSources.import-list      = %MCR.MODS.EnrichmentResolver.DataSources.withoutScopus%
+MCR.MODS.EnrichmentResolver.DataSources.scopus-import    = Unpaywall GBV ZDB JOP
+MCR.MODS.EnrichmentResolver.DataSources.scopusImport     = %MCR.MODS.EnrichmentResolver.DataSources.withoutScopus%
+MCR.MODS.EnrichmentResolver.DataSources.withScopus       = (GBV CrossRef DataCite) PPN2DBT-ID DBT Scopus (PubMed IEEE arXiv) Unpaywall ZDB JOP
+MCR.MODS.EnrichmentResolver.DataSources.withoutScopus    = (GBV CrossRef DataCite) PPN2DBT-ID DBT (PubMed IEEE arXiv) Unpaywall ZDB JOP
+UBO.Scopus.Importer.ImportURI                            = xslStyle:mods2mycoreobject:enrich:scopus-import:xslStyle:%ThUniBib.Scopus.XSL%,%UBO.SupportedMODSFilterName%:%UBO.Scopus.Importer.ImportURI.Scopus%
 
 #pica2mods default configuration
 MCR.PICA2MODS.DATABASE=gvk
@@ -103,7 +107,7 @@ MCR.Metadata.Store.SVNBase=file:///%MCR.datadir%/versions-metadata
 UBO.Login.Path=servlets/MCRShibbolethLoginServlet
 
 UBO.Editable.Attributes=id_gnd,id_orcid,id_scopus,id_researcherid
-UBO.Export.Fields=id,origin_exact,subject,oa,license,genre,host_genre,person_aut,person_edt,title,id_doi,id_scopus,id_pubmed,id_isi,id_urn,id_ppn,id_dbt,host_title,series,id_issn,id_isbn,year,volume,issue,article_number,pages,place,publisher
+UBO.Export.Fields=id,origin_exact,subject,oa,license,accessrights,peerreviewed,genre,host_genre,person_aut,person_edt,title,id_doi,id_scopus,id_pubmed,id_isi,id_urn,id_ppn,id_dbt,host_title,series,id_issn,id_isbn,year,volume,issue,article_number,pages,place,publisher
 
 MCR.URIResolver.Classification.Sort.typeOfResource=false 
 MCR.URIResolver.Classification.Sort.ubogenre=false 

diff --git a/common/src/main/resources/config/thunibib-common/solr/main/solr-config.json b/common/src/main/resources/config/thunibib-common/solr/main/solr-config.json
@@ -14,6 +14,7 @@
         "fl": "id",
         "facet": "true",
         "facet.mincount": "1",
+        "f.year.facet.limit": -1,
         "facet.field": [
           "status",
           "partOf",
@@ -125,6 +126,7 @@
         "fl": "id",
         "facet": "true",
         "facet.mincount": "1",
+        "f.year.facet.limit": -1,
         "facet.field": [
           "status",
           "partOf",
@@ -164,6 +166,7 @@
         "fl": "id",
         "facet": "true",
         "facet.mincount": "1",
+        "f.year.facet.limit": -1,
         "facet.field": [
           "status",
           "partOf",

diff --git a/common/src/main/resources/setup/classifications/ubogenre.xml b/common/src/main/resources/setup/classifications/ubogenre.xml
@@ -380,8 +380,7 @@
     </category>
     <category ID="others">
       <label xml:lang="x-hosts" text="standalone"/>
-      <label xml:lang="x-mapping"
-             text="orcidWorkType:other orcidWorkType:disclosure orcidWorkType:license orcidWorkType:registered-copyright orcidWorkType:trademark orcidWorkType:artistic-performance orcidWorkType:data-management-plan orcidWorkType:inventio orcidWorkType:research-technique orcidWorkType:spin-off-company orcidWorkType:standards-and-policy orcidWorkType:technical-standard"/>
+      <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
       <label xml:lang="de" text="Sonstiges"/>
       <label xml:lang="en" text="Other"/>

diff --git a/common/src/main/resources/xsl/import/ppn2dbt-id.xsl b/common/src/main/resources/xsl/import/ppn2dbt-id.xsl
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:mods="http://www.loc.gov/mods/v3"
+                exclude-result-prefixes="xsl">
+
+  <xsl:template match="/response">
+    <mods:mods>
+      <xsl:apply-templates select="result/doc"/>
+    </mods:mods>
+  </xsl:template>
+
+  <xsl:template match="doc">
+    <mods:identifier type="dbt">
+      <xsl:value-of select="str[@name='id']"/>
+    </mods:identifier>
+  </xsl:template>
+</xsl:stylesheet>