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

(-)a/catalogue/search.pl (-1 / +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
use Koha::SearchEngine::Search;
157
use Koha::SearchEngine::Search;
Lines 465-470 for (my $ii = 0; $ii < @operands; ++$ii) Link Here
465
# Params that can only have one value
465
# Params that can only have one value
466
my $scan = $params->{'scan'};
466
my $scan = $params->{'scan'};
467
my $count = C4::Context->preference('numSearchResults') || 20;
467
my $count = C4::Context->preference('numSearchResults') || 20;
468
my @results_per_page_options = grep /^\d+$/,
469
                               map {s/\s+//g;$_;}
470
                               split /,/, C4::Context->preference('numSearchResultsPerPage');
471
push(@results_per_page_options, $count);
472
@results_per_page_options = do { my %seen; grep { !$seen{$_}++ } @results_per_page_options };
473
@results_per_page_options = sort {$a <=> $b} @results_per_page_options;
474
468
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
475
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
469
my $page = $cgi->param('page') || 1;
476
my $page = $cgi->param('page') || 1;
470
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
477
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
(-)a/opac/opac-search.pl (-1 / +7 lines)
Lines 523-528 if ($params->{'limit-yr'}) { Link Here
523
my $scan = $params->{'scan'};
523
my $scan = $params->{'scan'};
524
my $count = C4::Context->preference('OPACnumSearchResults') || 20;
524
my $count = C4::Context->preference('OPACnumSearchResults') || 20;
525
my $countRSS         = C4::Context->preference('numSearchRSSResults') || 50;
525
my $countRSS         = C4::Context->preference('numSearchRSSResults') || 50;
526
my @results_per_page_options = grep /^\d+$/,
527
                               map {s/\s+//g;$_;}
528
                               split /,/, C4::Context->preference('OPACnumSearchResultsPerPage');
529
push(@results_per_page_options, $count);
530
@results_per_page_options = do { my %seen; grep { !$seen{$_}++ } @results_per_page_options };
531
@results_per_page_options = sort {$a <=> $b} @results_per_page_options;
532
526
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
533
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
527
my $page = $cgi->param('page') || 1;
534
my $page = $cgi->param('page') || 1;
528
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
535
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
529
- 

Return to bug 14715