From 6e6082852ec647a488091f3b7b8f229cc975e4f7 Mon Sep 17 00:00:00 2001
From: Kathleen Neumann <neumann@gbv.de>
Date: Thu, 26 Sep 2024 10:34:52 +0200
Subject: [PATCH 1/7] migrate to UBO LTS 2023

---
 pom.xml                                       |  2 +-
 .../META-INF/resources/statistics.xml         | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 27351c3..ba4ff94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.gbv.reposis</groupId>
     <artifactId>reposis_parent</artifactId>
-    <version>2022.06-SNAPSHOT</version>
+    <version>2023.06-SNAPSHOT</version>
     <relativePath />
   </parent>
   <groupId>de.gbv.ubo</groupId>
diff --git a/src/main/resources/META-INF/resources/statistics.xml b/src/main/resources/META-INF/resources/statistics.xml
index 7cccdb6..0386156 100644
--- a/src/main/resources/META-INF/resources/statistics.xml
+++ b/src/main/resources/META-INF/resources/statistics.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<webpage lastModified="$Date: 2017-02-10 07:55:23 +0100 (Fr, 10 Feb 2017) $" id="dozbib.stats">
+<webpage lastModified="2023-11-16 11:15:00" id="dozbib.stats" xmlns:i18n="http://www.mycore.org/i18n">
   <title xml:lang="de">Statistiken</title>
   <title xml:lang="en">Statistics</title>
 
-  <script src="webjars/highcharts/5.0.1/highcharts.src.js" type="text/javascript"></script>
-  <script src="webjars/highcharts/5.0.1/themes/grid.js" type="text/javascript"></script>
+  <script src="webjars/highcharts/5.0.1/highcharts.src.js" type="text/javascript" />
+  <script src="webjars/highcharts/5.0.1/themes/grid.js" type="text/javascript" />
 
   <div id="chartDialog" />
 
@@ -34,15 +34,15 @@
     </div>
   </article>
 
-  <xinclude uri="xslStyle:statistics:solr:q=partOf%3Atrue+AND+status%3Aconfirmed+year%3A%5B2013+TO+*%5D&amp;rows=0&amp;facet.field=year" />
-  <xinclude uri="xslStyle:statistics:solr:q=partOf%3Atrue+AND+status%3Aconfirmed&amp;rows=0&amp;facet.field=origin_toplevel" />
-  <xinclude uri="xslStyle:statistics:solr:q=partOf%3Atrue+AND+status%3Aconfirmed&amp;rows=0&amp;facet.field=genre" />
-  <!-- xinclude uri="xslStyle:statistics:solr:q=partOf%3Atrue+AND+status%3Aconfirmed&amp;rows=0&amp;facet.field=subject" / -->
-  <xinclude uri="xslStyle:statistics:solr:q=partOf%3Atrue+AND+status%3Aconfirmed&amp;rows=0&amp;facet.field=koeln_accessrights" />
-  <xinclude uri="xslStyle:statistics-oa:solr:q=partOf%3Atrue+AND+status:confirmed+AND+year%3A[2018+TO+*]&amp;rows=0&amp;json.facet={year:{type:terms,field:year,sort:{index:asc},facet:{oa:{type:terms,field:oa,sort:{index:asc}}}}}" />
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3Aconfirmed+year%3A%5B2013+TO+*%5D&amp;rows=0&amp;facet.field=year" />
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3Aconfirmed&amp;rows=0&amp;facet.field=origin_toplevel" />
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3Aconfirmed&amp;rows=0&amp;facet.field=genre" />
+  <!-- xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3Aconfirmed&amp;rows=0&amp;facet.field=subject" / -->
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3Aconfirmed&amp;rows=0&amp;facet.field=koeln_accessrights" />
+  <xinclude uri="xslStyle:statistics-oa:solr:requestHandler:select:q=partOf%3Atrue+AND+status:confirmed+AND+year%3A[2018+TO+*]&amp;rows=0&amp;json.facet={year:{type:terms,field:year,sort:{index:asc},facet:{oa:{type:terms,field:oa,sort:{index:asc}}}}}" />
 
 
-  <xinclude uri="xslStyle:statistics:solr:q=partOf%3Atrue+AND+status%3Aconfirmed+year%3A%5B2012+TO+*%5D&amp;rows=0&amp;facet.field=nid_dhsbid&amp;facet.limit=25" />
-  <xinclude uri="xslStyle:statistics:solr:q=objectKind%3Aname&amp;rows=0&amp;facet.pivot=name_id_type,name_id_type" />
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3Aconfirmed+year%3A%5B2012+TO+*%5D&amp;rows=0&amp;facet.field=nid_dhsbid&amp;facet.limit=25" />
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=objectKind%3Aname&amp;rows=0&amp;facet.pivot=name_id_type,name_id_type" />
 
  </webpage>

From 07164a5bf8ce0834e6743e544755c7a2dd673ccb Mon Sep 17 00:00:00 2001
From: Kathleen Neumann <neumann@gbv.de>
Date: Thu, 26 Sep 2024 11:21:59 +0200
Subject: [PATCH 2/7] IM-15 - Aufbauorganisation aktualisiert

---
 src/main/resources/setup/classifications/ORIGIN.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/setup/classifications/ORIGIN.xml b/src/main/resources/setup/classifications/ORIGIN.xml
index 77c4b0e..e20a6c8 100644
--- a/src/main/resources/setup/classifications/ORIGIN.xml
+++ b/src/main/resources/setup/classifications/ORIGIN.xml
@@ -18,9 +18,15 @@
         <label xml:lang="de" text="Institut für die Wissenschaft der Sozialen Arbeit" />
         <label xml:lang="en" text="Institute for Research in Social Work" />
       </category>
+      <category ID="MIDI">
+        <label xml:lang="de" text="Institut für Migration und Diversität" />
+        <label xml:lang="en" text="Institut für Migration und Diversität" />
+        <label xml:lang="x-from" text="2023-01-01" />
+      </category>
       <category ID="INTERKULT">
-        <label xml:lang="de" text=" Institut für interkulturelle Bildung und Entwicklung" />
+        <label xml:lang="de" text="Institut für interkulturelle Bildung und Entwicklung" />
         <label xml:lang="en" text="Institute for Intercultural Education and Development" />
+        <label xml:lang="x-until" text="2022-12-31" />
       </category>
       <category ID="KJFE">
         <label xml:lang="de" text="Institut für Kindheit, Jugend, Familie und Erwachsene" />

From e42c479c459506fd2579e431595c9e3d3f7bd79a Mon Sep 17 00:00:00 2001
From: Kathleen Neumann <neumann@gbv.de>
Date: Thu, 26 Sep 2024 11:22:52 +0200
Subject: [PATCH 3/7] fixed typo in error report

---
 src/main/resources/META-INF/resources/his-error.xed | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/META-INF/resources/his-error.xed b/src/main/resources/META-INF/resources/his-error.xed
index c3d2660..8696616 100644
--- a/src/main/resources/META-INF/resources/his-error.xed
+++ b/src/main/resources/META-INF/resources/his-error.xed
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<webpage lastModified="2024-04-19" id="dozbib.his.error">
+<webpage lastModified="2024-09-26" id="dozbib.his.error">
  <title xml:lang="de">Fehlerbereich für KDSF-Mapping</title>
  <title xml:lang="en">Error section for KDSF mapping</title>
 
@@ -15,7 +15,7 @@
       </ul>
       <p>
         Importiert wird anhand der folgenden Query:
-        <a href="https://bibliografie.th-koeln.de/servlets/solr/select?core=main&q=status%3A%22confirmed%22+AND+NOT+genre%3A(%22journal%22+OR+%22patent%22+OR+%22newspaper%22+OR+%22series%22)+AND+objectType%3Amods&fl=*"
+        <a href="https://bibliografie.th-koeln.de/servlets/solr/select?core=main&amp;q=status%3A%22confirmed%22+AND+NOT+genre%3A(%22journal%22+OR+%22patent%22+OR+%22newspaper%22+OR+%22series%22)+AND+objectType%3Amods&amp;fl=*">
         Status ist "freigegeben" und ohne die Publikationstypen "Zeitschrift", "Patent", "Zeitung" und "Serie"></a>
       </p>
       <p>

From 1c6e3ce083bb70d97c8d8ba9f1f92d56b903facf Mon Sep 17 00:00:00 2001
From: Kathleen Neumann <neumann@gbv.de>
Date: Tue, 1 Oct 2024 18:01:49 +0200
Subject: [PATCH 4/7] use UBO.Frontend parameter

---
 src/main/resources/xsl/html-layout.xsl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/xsl/html-layout.xsl b/src/main/resources/xsl/html-layout.xsl
index c8e8add..927c26f 100644
--- a/src/main/resources/xsl/html-layout.xsl
+++ b/src/main/resources/xsl/html-layout.xsl
@@ -10,15 +10,16 @@
 
   <xsl:output method="xml" encoding="UTF-8" />
 
-  <xsl:param name="CurrentLang" />
-  <xsl:param name="UBO.Login.Path" />
+  <xsl:param name="CurrentLang"/>
+  <xsl:param name="UBO.Login.Path"/>
   <xsl:param name="UBO.TestInstance" />
 
-  <xsl:variable name="jquery.version" select="'3.5.1'" />
-  <xsl:variable name="jquery-ui.version" select="'1.13.2'" />
-  <xsl:variable name="chosen.version" select="'1.8.7'" />
-  <xsl:variable name="bootstrap.version" select="'4.4.1'" />
-  <xsl:variable name="font-awesome.version" select="'5.13.0'" />
+  <xsl:param name="UBO.Frontend.jquery.version"/>
+  <xsl:param name="UBO.Frontend.jquery-ui.version"/>
+  <xsl:param name="UBO.Frontend.chosen.version"/>
+  <xsl:param name="UBO.Frontend.bootstrap.version"/>
+  <xsl:param name="UBO.Frontend.font-awesome.version"/>
+  <xsl:param name="User-Agent"/>
 
   <!-- ==================== IMPORTS ==================== -->
   <!-- additional stylesheets -->

From 1c311e27bdc2d61ad2642dcb17a851147c7045da Mon Sep 17 00:00:00 2001
From: Kathleen Neumann <neumann@gbv.de>
Date: Tue, 1 Oct 2024 18:02:13 +0200
Subject: [PATCH 5/7] fix statistic url

---
 src/main/resources/META-INF/resources/statistics.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/resources/META-INF/resources/statistics.xml b/src/main/resources/META-INF/resources/statistics.xml
index 0386156..7663115 100644
--- a/src/main/resources/META-INF/resources/statistics.xml
+++ b/src/main/resources/META-INF/resources/statistics.xml
@@ -39,8 +39,7 @@
   <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3Aconfirmed&amp;rows=0&amp;facet.field=genre" />
   <!-- xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3Aconfirmed&amp;rows=0&amp;facet.field=subject" / -->
   <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3Aconfirmed&amp;rows=0&amp;facet.field=koeln_accessrights" />
-  <xinclude uri="xslStyle:statistics-oa:solr:requestHandler:select:q=partOf%3Atrue+AND+status:confirmed+AND+year%3A[2018+TO+*]&amp;rows=0&amp;json.facet={year:{type:terms,field:year,sort:{index:asc},facet:{oa:{type:terms,field:oa,sort:{index:asc}}}}}" />
-
+  <xinclude uri="xslStyle:statistics-oa:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3Aconfirmed+AND+year%3A[2018+TO+*]&amp;rows=0&amp;json.facet=%7Byear%3A%7Btype%3Aterms,field%3Ayear,sort%3A%7Bindex%3Aasc%7D,facet%3A%7Boa%3A%7Btype%3Aterms,field%3Aoa,sort%3A%7Bindex%3Aasc%7D%7D%7D%7D%7D" />
 
   <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3Aconfirmed+year%3A%5B2012+TO+*%5D&amp;rows=0&amp;facet.field=nid_dhsbid&amp;facet.limit=25" />
   <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=objectKind%3Aname&amp;rows=0&amp;facet.pivot=name_id_type,name_id_type" />

From 11fd5fc383758f3c04f4636bd76422bc4718e705 Mon Sep 17 00:00:00 2001
From: Kathleen Neumann <neumann@gbv.de>
Date: Tue, 1 Oct 2024 18:43:25 +0200
Subject: [PATCH 6/7] use UBO.Frontend properties in URLs

---
 src/main/resources/xsl/html-layout.xsl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/xsl/html-layout.xsl b/src/main/resources/xsl/html-layout.xsl
index 927c26f..8d0f084 100644
--- a/src/main/resources/xsl/html-layout.xsl
+++ b/src/main/resources/xsl/html-layout.xsl
@@ -49,13 +49,13 @@
       <meta http-equiv="x-ua-compatible" content="ie=edge" />
 
       <link href="{$WebApplicationBaseURL}rsc/sass/scss/bootstrap-ubo.min.css" rel="stylesheet" />
-      <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/jquery/{$jquery.version}/jquery.min.js"></script>
-      <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/bootstrap/{$bootstrap.version}/js/bootstrap.bundle.min.js"></script>
-      <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/chosen-js/{$chosen.version}/chosen.jquery.min.js"></script>
-      <link href="{$WebApplicationBaseURL}webjars/chosen-js/{$chosen.version}/chosen.min.css" rel="stylesheet" />
-      <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/jquery-ui/{$jquery-ui.version}/jquery-ui.js"></script>
-      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$jquery-ui.version}/jquery-ui.css" type="text/css"/>
-      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$font-awesome.version}/css/all.css" type="text/css"/>
+      <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"></script>
+      <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"></script>
+      <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.jquery.min.js"></script>
+      <link href="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.min.css" rel="stylesheet" />
+      <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"></script>
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css" type="text/css"/>
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>
       <link rel="stylesheet" href="https://webfonts.gbv.de/css?family=Droid+Sans|Droid+Sans+Mono:300,400" type="text/css" />
       <link rel="stylesheet" href="https://webfonts.gbv.de/css?family=Roboto:300,400" type="text/css" />
       <link rel="stylesheet" href="https://webfonts.gbv.de/css?family=Roboto+Condensed:300,400" type="text/css" />
@@ -64,8 +64,8 @@
 
       <script type="text/javascript">var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL" />';</script>
       <script type="text/javascript">var currentLang = '<xsl:value-of select="$CurrentLang" />';</script>
-      <script type="text/javascript" src="{$WebApplicationBaseURL}js/session-polling.js"></script>
-      <script type="text/javascript" src="{$WebApplicationBaseURL}js/person-popover.js"></script>
+      <script type="text/javascript" src="{$WebApplicationBaseURL}js/session-polling.js" />
+      <script type="text/javascript" src="{$WebApplicationBaseURL}js/person-popover.js" />
       <xsl:copy-of select="node()" />
     </head>
   </xsl:template>

From 91ecdf010a48c4b2c49b8955794a74e0b4188c3f Mon Sep 17 00:00:00 2001
From: Kathleen Neumann <neumann@gbv.de>
Date: Tue, 1 Oct 2024 20:00:30 +0200
Subject: [PATCH 7/7] add number format to sidbar publication counts

---
 src/main/resources/xsl/response-sidebar-mini.xsl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/xsl/response-sidebar-mini.xsl b/src/main/resources/xsl/response-sidebar-mini.xsl
index 7fdf84e..80cb8d4 100644
--- a/src/main/resources/xsl/response-sidebar-mini.xsl
+++ b/src/main/resources/xsl/response-sidebar-mini.xsl
@@ -11,6 +11,8 @@
   <xsl:include href="coreFunctions.xsl" />
 
   <xsl:param name="ServletsBaseURL" />
+  
+  <xsl:decimal-format name="WesternEurope" decimal-separator="," grouping-separator="."/>
 
   <xsl:template match="/response">
   
@@ -26,7 +28,7 @@
           <xsl:value-of select="i18n:translate('ubo.numPublicationsTotal')" />
           <a href="{$ServletsBaseURL}solr/select?q=status:confirmed">
             <xsl:text> </xsl:text>
-            <xsl:value-of select="$numTotal"/>
+            <xsl:value-of select="format-number($numTotal, '##.###', 'WesternEurope')"/>
             <xsl:text> </xsl:text>
             <xsl:value-of select="i18n:translate('ubo.publications')" />
           </a>
@@ -37,7 +39,7 @@
         <xsl:value-of select="i18n:translate('ubo.numPublicationsTotal')" />
         <a href="{$ServletsBaseURL}solr/select?q=partOf:true+AND+status:confirmed">
           <xsl:text> </xsl:text>
-          <xsl:value-of select="result[@name='response']/@numFound"/>
+          <xsl:value-of select="format-number(result[@name='response']/@numFound, '##.###', 'WesternEurope')"/>
           <xsl:text> </xsl:text>
           <xsl:value-of select="i18n:translate('ubo.publications')" />
         </a>
@@ -51,7 +53,7 @@
                 <xsl:value-of select="@name"/>
                 <xsl:text>: </xsl:text>
                 <a href="{$ServletsBaseURL}solr/select?q=partOf:true+AND+status:confirmed+AND+year:{@name}">
-                  <xsl:value-of select="text()"/>
+                  <xsl:value-of select="format-number(text(), '##.###', 'WesternEurope')"/>
                   <xsl:text> </xsl:text>
                   <xsl:value-of select="i18n:translate('ubo.publications')" />
                 </a>