Attachment 103548 Details for Bug 8732 – Bug 8732: Allowing biblio level itemtypes to display instead of MARC ones

[patch] Bug 8732: Allowing biblio level itemtypes to display instead of MARC ones

Bug-8732-Allowing-biblio-level-itemtypes-to-displa.patch (text/plain), 21.91 KB, created by PTFS Europe Sandboxes on 2020-04-23 08:51:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: PTFS Europe Sandboxes

Created: 2020-04-23 08:51:55 UTC

Size: 21.91 KB

patch

obsolete

>From 797aef4269a9e30767a873afd5f77c6f86afce83 Mon Sep 17 00:00:00 2001
>From: Chris Cormack <chrisc@catalyst.net.nz>
>Date: Mon, 1 Oct 2012 10:58:06 +1300
>Subject: [PATCH] Bug 8732: Allowing biblio level itemtypes to display instead
> of MARC ones
>
>This patchset adds a new syspref: BiblioItemtypeImages
>
>If you set BiblioItemtypeImage to Koha, you will see the Koha
>itemtypes, if it is Control you will get the ones generated from
>the MARC control fields.
>
>The control field images are formed in XSLT and use label 'Material type'
>
>When switching to 'Koha' the images are added in the tmeplate and labeled 'Item type' if labelled
>
>TODO: Image size cleanup - adjust UNIMARC xslt
>
>To test:
> 1 - Apply patch
> 2 - Update database
> 3 - Do an opac search and view results
> 4 - Switch pref to 'Koha' and refresh
> 5 - Note itemtypes appear and material types dissappear
> 6 - Click in to a record details
> 7 - Note you see itemtype and icon
> 8 - Switch the pref
> 9 - Note you now see material type and icon
>10 - Repeat in staff interface
>
>Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>
>---
> C4/XSLT.pm | 3 +-
> catalogue/detail.pl | 2 +-
> ..._add_BiblioItemtypeImage_system_preference.perl | 7 +++++
> installer/data/mysql/sysprefs.sql | 1 +
> .../en/modules/admin/preferences/searching.pref | 7 +++++
> .../prog/en/modules/catalogue/detail.tt | 12 ++++++++
> .../prog/en/modules/catalogue/results.tt | 2 +-
> .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 7 +++--
> .../prog/en/xslt/MARC21slim2intranetResults.xsl | 7 +++--
> .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 36 ++++++++--------------
> .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 3 +-
> .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 3 ++
> .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 9 ++++--
> opac/opac-detail.pl | 1 +
> opac/opac-search.pl | 2 ++
> 15 files changed, 68 insertions(+), 34 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug_8732_add_BiblioItemtypeImage_system_preference.perl
>
>diff --git a/C4/XSLT.pm b/C4/XSLT.pm
>index 1b3941c7fb..33eda8664d 100644
>--- a/C4/XSLT.pm
>+++ b/C4/XSLT.pm
>@@ -173,7 +173,8 @@ sub get_xslt_sysprefs {
> TrackClicks opacthemes IdRef OpacSuppression
> OPACResultsLibrary OPACShowOpenURL
> OpenURLResolverURL OpenURLImageLocation
>- OpenURLText OPACShowMusicalInscripts OPACPlayMusicalInscripts / )
>+ OpenURLText OPACShowMusicalInscripts OPACPlayMusicalInscripts
>+ BiblioItemtypeImage / )
> {
> my $sp = C4::Context->preference( $syspref );
> next unless defined($sp);
>diff --git a/catalogue/detail.pl b/catalogue/detail.pl
>index c968e33dc9..b712afafd6 100755
>--- a/catalogue/detail.pl
>+++ b/catalogue/detail.pl
>@@ -523,7 +523,6 @@ if ( (C4::Context->preference("HTML5MediaEnabled") eq 'both') or (C4::Context->p
> }
> 
> # Displaying tags
>-
> my $tag_quantity;
> if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnDetail')) {
> $template->param(
>@@ -589,5 +588,6 @@ $template->param (countdeletedorders => $count_deletedorders_using_biblio);
> 
> $template->param (basketsorders => \@baskets_orders);
> $template->param (basketsdeletedorders => \@baskets_deletedorders);
>+$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage');
> 
> output_html_with_http_headers $query, $cookie, $template->output;
>diff --git a/installer/data/mysql/atomicupdate/bug_8732_add_BiblioItemtypeImage_system_preference.perl b/installer/data/mysql/atomicupdate/bug_8732_add_BiblioItemtypeImage_system_preference.perl
>new file mode 100644
>index 0000000000..d47a6eeb35
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_8732_add_BiblioItemtypeImage_system_preference.perl
>@@ -0,0 +1,7 @@
>+$DBversion = 'XXX'; # will be replaced by the RM
>+if( CheckVersion( $DBversion ) ) {
>+ $dbh->do( "INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('BiblioItemtypeImage', 'Control','Control what biblio level itemtype image displays','Control|Koha','Choice')" );
>+
>+ SetVersion( $DBversion );
>+ print "Upgrade to $DBversion done (Bug 8732: Add new BiblioItemtypeImage to system preferences)\n";
>+}
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index e39352448c..555fbbb0ce 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -96,6 +96,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('BatchCheckoutsValidCategories','',NULL,'Patron categories allowed to checkout in a batch','Free'),
> ('BiblioAddsAuthorities','0',NULL,'If ON, adding a new biblio will check for an existing authority record and create one on the fly if one doesn\'t exist','YesNo'),
> ('BiblioDefaultView','normal','normal|marc|isbd','Choose the default detail view in the catalog; choose between normal, marc or isbd','Choice'),
>+('BiblioItemtypeImage','Control','Control which itemtype info displays for biblio level itemtypes','Control|Koha','Choice'),
> ('BibtexExportAdditionalFields', '', NULL , 'Define additional BibTex tags to export from MARC records in YAML format as an associative array with either a marc tag/subfield combination as the value, or a list of tag/subfield combinations.', 'textarea'),
> ('BlockExpiredPatronOpacActions','1',NULL,'Set whether an expired patron can perform opac actions such as placing holds or renew books, can be overridden on a per patron-type basis','YesNo'),
> ('BlockReturnOfLostItems','0','0','If enabled, items that are marked as lost cannot be returned.','YesNo'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
>index 9301c59ce7..2b8387bafb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
>@@ -270,3 +270,10 @@ Searching:
> - LIBRIS base URL
> - pref: LibrisURL
> - "Please only change this if you are sure it needs changing."
>+ -
>+ - "Display itemtype information from the "
>+ - pref: BiblioItemtypeImage
>+ choices:
>+ Control: "MARC control fields"
>+ Koha: "Koha biblio level itemtype"
>+ - "This preference only affects MARC21 XSLT views.
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>index 1091b50059..2f0618a9cd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -113,6 +113,18 @@
> 
> [% END %]
> MARC Preview: <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblionumber | uri %]&amp;viewas=html" title="MARC" class="previewMARC">Show</a>
>+ [% IF !item_level_itypes || BiblioItemtypeImage == 'Koha' %]
>+ Itemtype:
>+ [% IF ( imageurl ) %]
>+ <img src="[% imageurl | html %]" alt="" />
>+ [% END %]
>+ [% IF ( description ) %]
>+ [% description | html %]
>+ [% ELSE %]
>+ [% itemtype | html %]
>+ [% END %]
>+ 
>+ [% END %]
> 
> [% IF ( holdcount ) %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>index 220d7de5ea..27394c4797 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -463,7 +463,7 @@
> </td>
> 
> <td>
>- [% UNLESS ( item_level_itypes ) %]
>+ [% IF ( !item_level_itypes ) || Koha.Preference('BiblioItemtypeImage') == 'Koha' %]
> <div class="result-biblio-itemtype">
> [% IF !noItemTypeImages && SEARCH_RESULT.imageurl %]
> <img src="[% SEARCH_RESULT.imageurl | html %]" alt="[% SEARCH_RESULT.description | html %]" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>index 84f1055e4c..a0fc8b6264 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>@@ -28,6 +28,7 @@
> <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
> <xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/>
> <xsl:variable name="OpacSuppression" select="marc:sysprefs/marc:syspref[@name='OpacSuppression']"/>
>+	 <xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/>
> <xsl:variable name="TracingQuotesLeft">
> <xsl:choose>
> <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
>@@ -170,16 +171,18 @@
> <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
> </xsl:call-template>
> 
>- <xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''">
>+ <xsl:if test="$BiblioItemtypeImage='Control'">
>+ <xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''">
> Material type: 
> <xsl:element name="img"><xsl:attribute name="class">materialtype mt_icon_<xsl:value-of select="$materialTypeCode"/></xsl:attribute><xsl:attribute name="src">/intranet-tmpl/prog/img/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt"></xsl:attribute></xsl:element>
> <xsl:text> </xsl:text>
> <xsl:value-of select="$materialTypeLabel"/>
> 
>- </xsl:if>
> 
> <xsl:call-template name="show-lang-041"/>
> 
>+ </xsl:if>
>+ </xsl:if>
> 
> <xsl:if test="$display880">
> <xsl:call-template name="m880Select">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
>index 89c6d0acd2..82c6e7dac7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
>@@ -26,6 +26,7 @@
> <xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/>
> <xsl:variable name="IntranetBiblioDefaultView" select="marc:sysprefs/marc:syspref[@name='IntranetBiblioDefaultView']"/>
> <xsl:variable name="OpacSuppression" select="marc:sysprefs/marc:syspref[@name='OpacSuppression']"/>
>+ <xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/>
> <xsl:variable name="leader" select="marc:leader"/>
> <xsl:variable name="leader6" select="substring($leader,7,1)"/>
> <xsl:variable name="leader7" select="substring($leader,8,1)"/>
>@@ -482,6 +483,7 @@
> 
> <xsl:if test="$DisplayIconsXSLT!='0'">
> 
>+ <xsl:if test="$BiblioItemtypeImage='Control'">
> <xsl:if test="$typeOf008!=''">
> 
> Material type: 
>@@ -506,12 +508,13 @@
> <xsl:when test="$leader6='i'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/sound.png" alt="sound" title="sound" class="materialtype mt_icon_MU"/> Sound</xsl:when>
> <xsl:when test="$leader6='j'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/sound.png" alt="music" title="music" class="materialtype mt_icon_MU"/> Music</xsl:when>
> </xsl:choose>
>- 
>+ ; 
>+ </xsl:if>
> </xsl:if>
> 
> <xsl:if test="string-length(normalize-space($physicalDescription))">
> 
>- ; Format: <xsl:copy-of select="$physicalDescription"></xsl:copy-of>
>+ Format: <xsl:copy-of select="$physicalDescription"></xsl:copy-of>
> 
> </xsl:if>
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>index bf7f7c6a98..8151079482 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>@@ -127,16 +127,6 @@
> <h1 class="title">[% INCLUDE 'biblio-title.inc' %]</h1>
> [% IF ( author ) %]<h5 class="author">by <a class="contributors" href="/cgi-bin/koha/opac-search.pl?q=au:[% author |url %]">[% author | html %]</a></h5>[% END %]
> 
>- [% UNLESS ( item_level_itypes ) %]
>- [
>- [% IF ( description ) %]
>- [% description | html %]
>- [% ELSE %]
>- [% itemtype | html %]
>- [% END %]
>- ] [% END %]
>- [% IF ( unititle ) %], [% unititle | html %][% END %]
>- 
> 
> [% IF ( MARCAUTHORS ) %]
> <div class="results_summary">
>@@ -246,19 +236,6 @@
> Year: [% copyrightdate | html %]
> [% END %]
> 
>- [% UNLESS ( item_level_itypes ) %]
>- [% IF ( imgeurl && !Koha.Preference('OpacNoItemTypeImages') ) %]
>- <img src="[% imageurl | html %]" alt="" />
>- [% END %]
>- Item type: 
>- [% IF ( description ) %]
>- [% description | html %]
>- [% ELSE %]
>- [% itemtype | html %]
>- [% END %]
>- 
>- [% END %]
>-
> [% IF ( MARCURLS ) %]
> <div class="results_summary online_resources">Online resources:
> <ul>
>@@ -293,6 +270,19 @@
> [% END # / IF MARCURLS %]
> [% END # / IF OPACXSLTDetailsDisplay %]
> 
>+ [% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeImage') == 'Koha' ) && !Koha.Preference('OpacNoItemTypeImages') %]
>+ Item type: 
>+ [% IF ( imageurl ) %]
>+ <img src="[% imageurl | html %]" alt="" />
>+ [% END %]
>+ [% IF ( description ) %]
>+ [% description | html %]
>+ [% ELSE %]
>+ [% itemtype | html %]
>+ [% END %]
>+ 
>+ [% END %]
>+
> 
> [% IF ( LibraryThingForLibrariesID ) %]
> [% UNLESS ( LibraryThingForLibrariesTabbedView ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>index a226ceefc8..3c9c692102 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>@@ -252,8 +252,7 @@
> [% SEARCH_RESULT.result_number | html %].
> [% END %]
> </td>
>-
>- [% IF ( !item_level_itypes && !Koha.Preference('OpacNoItemTypeImages') ) %]
>+ [% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeImage') == 'Koha' ) && !Koha.Preference('OpacNoItemTypeImages') %]
> [% # Cell 3: Show item type image %]
> <td class="itypecol">
> [% IF ( SEARCH_RESULT.imageurl ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>index 5d79840678..3602c89464 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>@@ -31,6 +31,7 @@
> <xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/>
> <xsl:variable name="theme" select="marc:sysprefs/marc:syspref[@name='opacthemes']"/>
> <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
>+ <xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/>
> <xsl:variable name="TracingQuotesLeft">
> <xsl:choose>
> <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
>@@ -187,6 +188,7 @@
> </xsl:call-template>
> 
> <xsl:if test="$DisplayOPACiconsXSLT!='0'">
>+ <xsl:if test="$BiblioItemtypeImage='Control'">
> <xsl:if test="$materialTypeCode!=''">
> Material type: 
> <xsl:element name="img">
>@@ -197,6 +199,7 @@
> <xsl:value-of select="$materialTypeLabel"/>
> 
> </xsl:if>
>+	</xsl:if>
> </xsl:if>
> 
> <xsl:call-template name="show-lang-041"/>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
>index d29fdceaee..3bc61d9465 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
>@@ -19,8 +19,8 @@
> </xsl:template>
> <xsl:template match="marc:record">
> 
>- 
>- <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
>+ 
>+ <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
> 
> <xsl:variable name="OPACResultsLibrary" select="marc:sysprefs/marc:syspref[@name='OPACResultsLibrary']"/>
> <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
>@@ -35,6 +35,7 @@
> <xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>
> <xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/>
> <xsl:variable name="BiblioDefaultView" select="marc:sysprefs/marc:syspref[@name='BiblioDefaultView']"/>
>+ <xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/>
> <xsl:variable name="leader" select="marc:leader"/>
> <xsl:variable name="leader6" select="substring($leader,7,1)"/>
> <xsl:variable name="leader7" select="substring($leader,8,1)"/>
>@@ -659,6 +660,9 @@
> 
> <xsl:if test="$DisplayOPACiconsXSLT!='0'">
> 
>+
>+ <xsl:if test="$BiblioItemtypeImage='Control'">
>+
> <xsl:if test="$typeOf008!=''">
> 
> Material type: 
>@@ -1018,6 +1022,7 @@
> </xsl:choose>
> 
> </xsl:if>
>+ </xsl:if>
> <xsl:text> </xsl:text> 
> 	
> </xsl:if>
>diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
>index f1100878bd..4625544516 100755
>--- a/opac/opac-detail.pl
>+++ b/opac/opac-detail.pl
>@@ -1189,6 +1189,7 @@ my $defaulttab =
> @serialcollections > 0 
> ? 'serialcollection' : 'subscriptions';
> $template->param('defaulttab' => $defaulttab);
>+$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage');
> 
> if (C4::Context->preference('OPACLocalCoverImages') == 1) {
> my @images = ListImagesForBiblio($biblionumber);
>diff --git a/opac/opac-search.pl b/opac/opac-search.pl
>index 01887f283a..6ab5e8c8e4 100755
>--- a/opac/opac-search.pl
>+++ b/opac/opac-search.pl
>@@ -3,6 +3,7 @@
> # Copyright 2008 Garry Collum and the Koha Development team
> # Copyright 2010 BibLibre
> # Copyright 2011 KohaAloha, NZ
>+# Copyright 2012 Catalyst IT, NZ
> #
> # This file is part of Koha.
> #
>@@ -1023,6 +1024,7 @@ if (C4::Context->preference('GoogleIndicTransliteration')) {
> $template->{VARS}->{DidYouMean} =
> ( defined C4::Context->preference('OPACdidyoumean')
> && C4::Context->preference('OPACdidyoumean') =~ m/enable/ );
>+$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage');
> 
> if ($offset == 0) {
> $template->param(firstPage => 1);
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 8732: 12029 | 12047 | 12614 | 12722 | 12870 | 16453 | 16454 | 21820 | 21821 | 53470 | 53471 | 91885 | 92383 | 103488 | 103548 | 106831 | 106836 | 106848 | 106948 | 107705 | 107706 | 107707 | 107709 | 108322 | 108441 | 108764 | 108765 | 108766 | 108767 | 108768 | 108769 | 108770