Jonathan Druart
de2df0dfe8
The authority search pagination displays only 15 pages, even when there are more. To fix that, this patch mimic the authorities-home.pl intranet script to manage the pagination. Test plan: Without this patch, do some authority search and click on different pages. Apply this patch, redo the same search and make sure the same records are displayed (i.e. confirm that the pagination still works as before). Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
189 lines
6 KiB
Perl
Executable file
189 lines
6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
# WARNING: 4-character tab stops here
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use URI::Escape;
|
|
use C4::Auth;
|
|
|
|
use C4::Context;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::AuthoritiesMarc;
|
|
use C4::Koha;
|
|
use C4::Search::History;
|
|
|
|
use Koha::Authority::Types;
|
|
use Koha::SearchEngine::Search;
|
|
use Koha::SearchEngine::QueryBuilder;
|
|
|
|
my $query = new CGI;
|
|
my $op = $query->param('op') || '';
|
|
my $authtypecode = $query->param('authtypecode') || '';
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
my $startfrom = $query->param('startfrom') || 1;
|
|
my $resultsperpage = $query->param('resultsperpage') || 20;
|
|
my $authid = $query->param('authid');
|
|
my ( $template, $loggedinuser, $cookie );
|
|
|
|
my $authority_types = Koha::Authority::Types->search({}, { order_by => ['authtypetext']});
|
|
|
|
if ( $op eq "do_search" ) {
|
|
my @marclist = $query->multi_param('marclist');
|
|
my @and_or = $query->multi_param('and_or');
|
|
my @excluding = $query->multi_param('excluding');
|
|
my @operator = $query->multi_param('operator');
|
|
my $orderby = $query->param('orderby');
|
|
my @value = $query->multi_param('value');
|
|
$value[0] ||= q||;
|
|
|
|
my @tags;
|
|
my $builder = Koha::SearchEngine::QueryBuilder->new(
|
|
{ index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
|
|
my $searcher = Koha::SearchEngine::Search->new(
|
|
{ index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
|
|
my $search_query = $builder->build_authorities_query_compat( \@marclist, \@and_or,
|
|
\@excluding, \@operator, \@value, $authtypecode, $orderby );
|
|
my ( $results, $total ) =
|
|
$searcher->search_auth_compat( $search_query, $startfrom, $resultsperpage );
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-authoritiessearchresultlist.tt",
|
|
query => $query,
|
|
type => 'opac',
|
|
authnotrequired => 1,
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
# multi page display gestion
|
|
my $value_url = uri_escape_utf8($value[0]);
|
|
my $base_url = "opac-authorities-home.pl?"
|
|
."marclist=$marclist[0]"
|
|
."&and_or=$and_or[0]"
|
|
."&excluding=$excluding[0]"
|
|
."&operator=$operator[0]"
|
|
."&value=$value_url"
|
|
."&resultsperpage=$resultsperpage"
|
|
."&type=opac"
|
|
."&op=do_search"
|
|
."&authtypecode=$authtypecode"
|
|
."&orderby=$orderby";
|
|
|
|
my $from = ( $startfrom - 1 ) * $resultsperpage + 1;
|
|
my $to;
|
|
if ( !defined $total ) {
|
|
$total = 0;
|
|
}
|
|
|
|
if ( $total < $startfrom * $resultsperpage ) {
|
|
$to = $total;
|
|
}
|
|
else {
|
|
$to = $startfrom * $resultsperpage;
|
|
}
|
|
|
|
$template->param( result => $results ) if $results;
|
|
|
|
$template->param(
|
|
pagination_bar => pagination_bar(
|
|
$base_url, int( $total / $resultsperpage ) + 1,
|
|
$startfrom, 'startfrom'
|
|
),
|
|
total => $total,
|
|
from => $from,
|
|
to => $to,
|
|
);
|
|
|
|
unless (C4::Context->preference('OPACShowUnusedAuthorities')) {
|
|
# TODO implement usage counts
|
|
# my @usedauths = grep { $_->{used} > 0 } @$results;
|
|
# $results = \@usedauths;
|
|
}
|
|
|
|
# Opac search history
|
|
if (C4::Context->preference('EnableOpacSearchHistory')) {
|
|
unless ( $startfrom ) {
|
|
my $path_info = $query->url(-path_info=>1);
|
|
my $query_cgi_history = $query->url(-query=>1);
|
|
$query_cgi_history =~ s/^$path_info\?//;
|
|
$query_cgi_history =~ s/;/&/g;
|
|
|
|
unless ( $loggedinuser ) {
|
|
my $new_search = C4::Search::History::add_to_session({
|
|
cgi => $query,
|
|
query_desc => $value[0],
|
|
query_cgi => $query_cgi_history,
|
|
total => $total,
|
|
type => "authority",
|
|
});
|
|
} else {
|
|
# To the session (the user is logged in)
|
|
C4::Search::History::add({
|
|
userid => $loggedinuser,
|
|
sessionid => $query->cookie("CGISESSID"),
|
|
query_desc => $value[0],
|
|
query_cgi => $query_cgi_history,
|
|
total => $total,
|
|
type => "authority",
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
$template->param( orderby => $orderby );
|
|
$template->param(
|
|
startfrom => $startfrom,
|
|
resultsperpage => $resultsperpage,
|
|
countfuzzy => !(C4::Context->preference('OPACShowUnusedAuthorities')),
|
|
resultcount => scalar @$results,
|
|
authtypecode => $authtypecode,
|
|
authtypetext => $authority_types->find($authtypecode)->authtypetext,
|
|
isEDITORS => $authtypecode eq 'EDITORS',
|
|
);
|
|
|
|
}
|
|
else {
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-authorities-home.tt",
|
|
query => $query,
|
|
type => 'opac',
|
|
authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
}
|
|
|
|
$template->param(
|
|
authority_types => $authority_types,
|
|
authtypecode => $authtypecode,
|
|
);
|
|
|
|
# Print the page
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|
|
|
|
# Local Variables:
|
|
# tab-width: 4
|
|
# End:
|