View | Details | Raw Unified | Return to bug 14715
Collapse All | Expand All

(-)a/catalogue/search.pl (-2 / +8 lines)
Lines 151-157 use URI::Escape; Link Here
151
use POSIX qw(ceil floor);
151
use POSIX qw(ceil floor);
152
use C4::Branch; # GetBranches
152
use C4::Branch; # GetBranches
153
use C4::Search::History;
153
use C4::Search::History;
154
154
use String::Random;
155
use Koha::LibraryCategories;
155
use Koha::LibraryCategories;
156
use Koha::Virtualshelves;
156
use Koha::Virtualshelves;
157
157
Lines 474-479 for (my $ii = 0; $ii < @operands; ++$ii) Link Here
474
# Params that can only have one value
474
# Params that can only have one value
475
my $scan = $params->{'scan'};
475
my $scan = $params->{'scan'};
476
my $count = C4::Context->preference('numSearchResults') || 20;
476
my $count = C4::Context->preference('numSearchResults') || 20;
477
my @results_per_page_options = grep /^\d+$/,
478
                               map {s/\s+//g;$_;}
479
                               split /,/, C4::Context->preference('numSearchResultsPerPage');
480
push(@results_per_page_options, $count);
481
@results_per_page_options = do { my %seen; grep { !$seen{$_}++ } @results_per_page_options };
482
@results_per_page_options = sort {$a <=> $b} @results_per_page_options;
483
477
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
484
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
478
my $page = $cgi->param('page') || 1;
485
my $page = $cgi->param('page') || 1;
479
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
486
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
480
- 

Return to bug 14715