Lines 150-155
use C4::Members qw(GetMember);
Link Here
|
150 |
use C4::VirtualShelves; |
150 |
use C4::VirtualShelves; |
151 |
use URI::Escape; |
151 |
use URI::Escape; |
152 |
use POSIX qw(ceil floor); |
152 |
use POSIX qw(ceil floor); |
|
|
153 |
use String::Random; |
153 |
use C4::Branch; # GetBranches |
154 |
use C4::Branch; # GetBranches |
154 |
use C4::Search::History; |
155 |
use C4::Search::History; |
155 |
|
156 |
|
Lines 473-478
for (my $ii = 0; $ii < @operands; ++$ii)
Link Here
|
473 |
# Params that can only have one value |
474 |
# Params that can only have one value |
474 |
my $scan = $params->{'scan'}; |
475 |
my $scan = $params->{'scan'}; |
475 |
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 |
|
482 |
@results_per_page_options = do { my %seen; grep { !$seen{$_}++ } @results_per_page_options }; |
483 |
@results_per_page_options = sort {$a <=> $b} @results_per_page_options; |
484 |
|
476 |
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count; |
485 |
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count; |
477 |
my $page = $cgi->param('page') || 1; |
486 |
my $page = $cgi->param('page') || 1; |
478 |
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0; |
487 |
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0; |
Lines 616-621
for (my $i=0;$i<@servers;$i++) {
Link Here
|
616 |
} |
625 |
} |
617 |
$template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed; |
626 |
$template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed; |
618 |
$template->param(results_per_page => $results_per_page == $hits ? 'all' : $results_per_page); |
627 |
$template->param(results_per_page => $results_per_page == $hits ? 'all' : $results_per_page); |
|
|
628 |
$template->param(results_per_page_options => \@results_per_page_options); |
619 |
# must define a value for size if not present in DB |
629 |
# must define a value for size if not present in DB |
620 |
# in order to avoid problems generated by the default size value in TT |
630 |
# in order to avoid problems generated by the default size value in TT |
621 |
foreach my $line (@newresults) { |
631 |
foreach my $line (@newresults) { |