From 44cd5e058bca8bc1fc35cf29a04c47e8b84dccec Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Wed, 30 May 2012 17:29:29 -0400 Subject: [PATCH] Bug 8205: Add OPACShowUnusedAuthorities syspref Rather than list authorities that are not actually used by a library, this commit introduces a new syspref: OPACShowUnusedAuthorities to enable libraries to hide unused authorities in the OPAC authority browser. To test: 1) Do a search in the OPAC authority browser that brings up multiple results, including some that are used in the bibliographic database and some that are not. 2) Observe that the results include both used and unused authorities. 3) Set OPACShowUnusedAuthorities to "Do not." 4) Repeat the same search as in step 1. 5) Observe that the results no longer include unused authorities. Signed-off-by: Katrin Fischer Preference is implemented cleanly and works like advertised. As a note: The unused authority records will be hidden from display, but the result list paging does not adjust for the hidden records. So the result pages will show more or less records total, depending on how many records are hidden. --- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 7 +++++++ .../prog/en/modules/admin/preferences/opac.pref | 6 ++++++ .../prog/en/modules/opac-authoritiessearchresultlist.tt | 6 +++++- opac/opac-authorities-home.pl | 6 ++++++ 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 6c6d91bc75..8e3066d675 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -371,3 +371,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsOpac', '1', NULL , 'Allow holds to be suspended from the OPAC.', 'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('DefaultLanguageField008','','Fill in the default language for field 008 Range 35-37 (e.g. eng, nor, ger, see MARC Code List for Languages)','','Free'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OPACShowBarcode','0','Show items barcode in holding tab','','YesNo'); +INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OPACShowUnusedAuthorities','1','','Show authorities that are not being used in the OPAC.','YesNo'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 9533b66322..baedddf6f6 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5416,6 +5416,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion($DBversion); } +$DBversion = "3.09.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OPACShowUnusedAuthorities','1','','Show authorities that are not being used in the OPAC.','YesNo')"); + print "Upgrade to $DBversion done (Add OPACShowUnusedAuthorities system preference)\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 7ca4692623..258b078ea1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -78,6 +78,12 @@ OPAC: yes: Include no: "Don't include" - "COinS / OpenURL / Z39.88 in OPAC search results.
Warning: Enabling this feature will slow OPAC search response times." + - + - pref: OPACShowUnusedAuthorities + choices: + yes: Show + no: "Do not show" + - unused authorities in the OPAC authority browser. - - pref: OPACShowHoldQueueDetails choices: diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt index a27480a1ed..9e6c3d6723 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt @@ -30,7 +30,11 @@
[% IF ( total ) %] - Results [% from %] to [% to %] of [% total %] + [% IF ( countfuzzy ) %] + Showing [% resultcount %] of about [% total %] results + [% ELSE %] + Results [% from %] to [% to %] of [% total %] + [% END %] [% ELSE %] No results found. [% END %] diff --git a/opac/opac-authorities-home.pl b/opac/opac-authorities-home.pl index acff077caf..4e9f9ab4fb 100755 --- a/opac/opac-authorities-home.pl +++ b/opac/opac-authorities-home.pl @@ -127,6 +127,10 @@ if ( $op eq "do_search" ) { else { $to = ( ( $startfrom + 1 ) * $resultsperpage ); } + unless (C4::Context->preference('OPACShowUnusedAuthorities')) { + my @usedauths = grep { $_->{used} > 0 } @$results; + $results = \@usedauths; + } $template->param( result => $results ) if $results; $template->param( FIELDS => \@fields ); $template->param( orderby => $orderby ); @@ -138,9 +142,11 @@ if ( $op eq "do_search" ) { startfromnext => $startfrom + 1, startfromprev => $startfrom - 1, searchdata => \@field_data, + countfuzzy => !(C4::Context->preference('OPACShowUnusedAuthorities')), total => $total, from => $from, to => $to, + resultcount => scalar @$results, numbers => \@numbers, authtypecode => $authtypecode, authtypetext => $authtypes->{$authtypecode}{'authtypetext'},