Skip to content
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

Migrate to 2023 #20

Merged
merged 7 commits into from
Oct 1, 2024
Merged

Migrate to 2023 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e60828
migrate to UBO LTS 2023
kkrebs Sep 26, 2024
07164a5
IM-15 - Aufbauorganisation aktualisiert
kkrebs Sep 26, 2024
e42c479
fixed typo in error report
kkrebs Sep 26, 2024
1c6e3ce
use UBO.Frontend parameter
kkrebs Oct 1, 2024
1c311e2
fix statistic url
kkrebs Oct 1, 2024
11fd5fc
use UBO.Frontend properties in URLs
kkrebs Oct 1, 2024
91ecdf0
add number format to sidbar publication counts
kkrebs Oct 1, 2024
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/resources/his-error.xed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand All @@ -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>
Expand Down
23 changes: 11 additions & 12 deletions src/main/resources/META-INF/resources/statistics.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />

Expand Down Expand Up @@ -34,15 +34,14 @@
</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%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: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>
8 changes: 7 additions & 1 deletion src/main/resources/setup/classifications/ORIGIN.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
33 changes: 17 additions & 16 deletions src/main/resources/xsl/html-layout.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -48,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" />
Expand All @@ -63,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>
Expand Down
8 changes: 5 additions & 3 deletions src/main/resources/xsl/response-sidebar-mini.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
Loading