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 446-455
for (my $ii = 0; $ii < @operands; ++$ii)
Link Here
|
446 |
# Params that can only have one value |
446 |
# Params that can only have one value |
447 |
my $scan = $params->{'scan'}; |
447 |
my $scan = $params->{'scan'}; |
448 |
my $count = C4::Context->preference('numSearchResults') || 20; |
448 |
my $count = C4::Context->preference('numSearchResults') || 20; |
449 |
my $results_per_page = $params->{'count'} || $count; |
449 |
my @results_per_page_options = grep /^\d+$/, |
450 |
my $offset = $params->{'offset'} || 0; |
450 |
map {s/\s+//g;$_;} |
|
|
451 |
split /,/, C4::Context->preference('numSearchResultsPerPage'); |
452 |
push(@results_per_page_options, $count); |
453 |
@results_per_page_options = do { my %seen; grep { !$seen{$_}++ } @results_per_page_options }; |
454 |
@results_per_page_options = sort {$a <=> $b} @results_per_page_options; |
455 |
|
456 |
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count; |
451 |
my $page = $cgi->param('page') || 1; |
457 |
my $page = $cgi->param('page') || 1; |
452 |
#my $offset = ($page-1)*$results_per_page; |
458 |
my $offset = $params->{'offset'} || 0; |
453 |
my $hits; |
459 |
my $hits; |
454 |
my $expanded_facet = $params->{'expand'}; |
460 |
my $expanded_facet = $params->{'expand'}; |
455 |
|
461 |
|
Lines 536-541
for (my $i=0;$i<@servers;$i++) {
Link Here
|
536 |
my $server = $servers[$i]; |
542 |
my $server = $servers[$i]; |
537 |
if ($server =~/biblioserver/) { # this is the local bibliographic server |
543 |
if ($server =~/biblioserver/) { # this is the local bibliographic server |
538 |
$hits = $results_hashref->{$server}->{"hits"}; |
544 |
$hits = $results_hashref->{$server}->{"hits"}; |
|
|
545 |
$results_per_page = $hits if $results_per_page == 'all'; |
539 |
my $page = $cgi->param('page') || 0; |
546 |
my $page = $cgi->param('page') || 0; |
540 |
my @newresults = searchResults('intranet', $query_desc, $hits, $results_per_page, $offset, $scan, |
547 |
my @newresults = searchResults('intranet', $query_desc, $hits, $results_per_page, $offset, $scan, |
541 |
$results_hashref->{$server}->{"RECORDS"}); |
548 |
$results_hashref->{$server}->{"RECORDS"}); |
Lines 599-605
for (my $i=0;$i<@servers;$i++) {
Link Here
|
599 |
if ($query_desc || $limit_desc) { |
606 |
if ($query_desc || $limit_desc) { |
600 |
$template->param(searchdesc => 1); |
607 |
$template->param(searchdesc => 1); |
601 |
} |
608 |
} |
602 |
$template->param(results_per_page => $results_per_page); |
609 |
$template->param(results_per_page => $results_per_page == $hits ? 'all' : $results_per_page); |
603 |
# must define a value for size if not present in DB |
610 |
# must define a value for size if not present in DB |
604 |
# in order to avoid problems generated by the default size value in TT |
611 |
# in order to avoid problems generated by the default size value in TT |
605 |
foreach my $line (@newresults) { |
612 |
foreach my $line (@newresults) { |