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

(-)a/catalogue/search.pl (-2 / +8 lines)
Lines 150-156 use C4::Members qw(GetMember); Link Here
150
use URI::Escape;
150
use URI::Escape;
151
use POSIX qw(ceil floor);
151
use POSIX qw(ceil floor);
152
use C4::Search::History;
152
use C4::Search::History;
153
153
use String::Random;
154
use Koha::LibraryCategories;
154
use Koha::LibraryCategories;
155
use Koha::Virtualshelves;
155
use Koha::Virtualshelves;
156
use Koha::SearchEngine::Search;
156
use Koha::SearchEngine::Search;
Lines 451-456 for (my $ii = 0; $ii < @operands; ++$ii) Link Here
451
# Params that can only have one value
451
# Params that can only have one value
452
my $scan = $params->{'scan'};
452
my $scan = $params->{'scan'};
453
my $count = C4::Context->preference('numSearchResults') || 20;
453
my $count = C4::Context->preference('numSearchResults') || 20;
454
my @results_per_page_options = grep /^\d+$/,
455
                               map {s/\s+//g;$_;}
456
                               split /,/, C4::Context->preference('numSearchResultsPerPage');
457
push(@results_per_page_options, $count);
458
@results_per_page_options = do { my %seen; grep { !$seen{$_}++ } @results_per_page_options };
459
@results_per_page_options = sort {$a <=> $b} @results_per_page_options;
460
454
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
461
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
455
my $page = $cgi->param('page') || 1;
462
my $page = $cgi->param('page') || 1;
456
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
463
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
457
- 

Return to bug 14715