Lines 481-490
if ($params->{'limit-yr'}) {
Link Here
|
481 |
my $scan = $params->{'scan'}; |
481 |
my $scan = $params->{'scan'}; |
482 |
my $count = C4::Context->preference('OPACnumSearchResults') || 20; |
482 |
my $count = C4::Context->preference('OPACnumSearchResults') || 20; |
483 |
my $countRSS = C4::Context->preference('numSearchRSSResults') || 50; |
483 |
my $countRSS = C4::Context->preference('numSearchRSSResults') || 50; |
484 |
my $results_per_page = $params->{'count'} || $count; |
484 |
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count; |
485 |
my $offset = $params->{'offset'} || 0; |
|
|
486 |
my $page = $cgi->param('page') || 1; |
485 |
my $page = $cgi->param('page') || 1; |
487 |
$offset = ($page-1)*$results_per_page if $page>1; |
486 |
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0; |
488 |
my $hits; |
487 |
my $hits; |
489 |
my $expanded_facet = $params->{'expand'}; |
488 |
my $expanded_facet = $params->{'expand'}; |
490 |
|
489 |
|
Lines 565-570
if ($tag) {
Link Here
|
565 |
# FIXME: No facets for tags search. |
564 |
# FIXME: No facets for tags search. |
566 |
} elsif ($build_grouped_results) { |
565 |
} elsif ($build_grouped_results) { |
567 |
eval { |
566 |
eval { |
|
|
567 |
unless($results_per_page =~ /\d+/) { # all |
568 |
# pazpar2 expects $results_per_page to be an integer, we hack around |
569 |
# this by setting $results_per_page to the max value of a 32bit |
570 |
# signed int - as defined by parpaz2 session.c:perform_termlist() |
571 |
$results_per_page = 2147483647; |
572 |
} |
568 |
($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan); |
573 |
($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan); |
569 |
}; |
574 |
}; |
570 |
} else { |
575 |
} else { |
Lines 598-603
for (my $i=0;$i<@servers;$i++) {
Link Here
|
598 |
my $server = $servers[$i]; |
603 |
my $server = $servers[$i]; |
599 |
if ($server && $server =~/biblioserver/) { # this is the local bibliographic server |
604 |
if ($server && $server =~/biblioserver/) { # this is the local bibliographic server |
600 |
$hits = $results_hashref->{$server}->{"hits"}; |
605 |
$hits = $results_hashref->{$server}->{"hits"}; |
|
|
606 |
$results_per_page = $hits if $results_per_page == 'all'; |
601 |
my $page = $cgi->param('page') || 0; |
607 |
my $page = $cgi->param('page') || 0; |
602 |
my @newresults; |
608 |
my @newresults; |
603 |
if ($build_grouped_results) { |
609 |
if ($build_grouped_results) { |
Lines 750-756
for (my $i=0;$i<@servers;$i++) {
Link Here
|
750 |
$template->param(searchdesc => 1); |
756 |
$template->param(searchdesc => 1); |
751 |
} |
757 |
} |
752 |
$template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed; |
758 |
$template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed; |
753 |
$template->param(results_per_page => $results_per_page); |
759 |
$template->param(results_per_page => $results_per_page == $hits ? 'all' : $results_per_page); |
754 |
my $hide = C4::Context->preference('OpacHiddenItems'); |
760 |
my $hide = C4::Context->preference('OpacHiddenItems'); |
755 |
$hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines |
761 |
$hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines |
756 |
my $branch = ''; |
762 |
my $branch = ''; |
757 |
- |
|
|