Lines 522-531
if ($params->{'limit-yr'}) {
Link Here
|
522 |
my $scan = $params->{'scan'}; |
522 |
my $scan = $params->{'scan'}; |
523 |
my $count = C4::Context->preference('OPACnumSearchResults') || 20; |
523 |
my $count = C4::Context->preference('OPACnumSearchResults') || 20; |
524 |
my $countRSS = C4::Context->preference('numSearchRSSResults') || 50; |
524 |
my $countRSS = C4::Context->preference('numSearchRSSResults') || 50; |
525 |
my $results_per_page = $params->{'count'} || $count; |
525 |
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count; |
526 |
my $offset = $params->{'offset'} || 0; |
|
|
527 |
my $page = $cgi->param('page') || 1; |
526 |
my $page = $cgi->param('page') || 1; |
528 |
$offset = ($page-1)*$results_per_page if $page>1; |
527 |
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0; |
529 |
my $hits; |
528 |
my $hits; |
530 |
my $expanded_facet = $params->{'expand'}; |
529 |
my $expanded_facet = $params->{'expand'}; |
531 |
|
530 |
|
Lines 607-613
if ($tag) {
Link Here
|
607 |
# FIXME: No facets for tags search. |
606 |
# FIXME: No facets for tags search. |
608 |
} elsif ($build_grouped_results) { |
607 |
} elsif ($build_grouped_results) { |
609 |
eval { |
608 |
eval { |
610 |
($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,undef,$query_type,$scan); |
609 |
unless($results_per_page =~ /\d+/) { # all |
|
|
610 |
# pazpar2 expects $results_per_page to be an integer, we hack around |
611 |
# this by setting $results_per_page to the max value of a 32bit |
612 |
# signed int - as defined by parpaz2 session.c:perform_termlist() |
613 |
$results_per_page = 2147483647; |
614 |
} |
615 |
($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan); |
611 |
}; |
616 |
}; |
612 |
} else { |
617 |
} else { |
613 |
$pasarParams .= '&query=' . uri_escape_utf8($query); |
618 |
$pasarParams .= '&query=' . uri_escape_utf8($query); |
Lines 633-638
for (my $i=0;$i<@servers;$i++) {
Link Here
|
633 |
my $server = $servers[$i]; |
638 |
my $server = $servers[$i]; |
634 |
if ($server && $server =~/biblioserver/) { # this is the local bibliographic server |
639 |
if ($server && $server =~/biblioserver/) { # this is the local bibliographic server |
635 |
$hits = $results_hashref->{$server}->{"hits"}; |
640 |
$hits = $results_hashref->{$server}->{"hits"}; |
|
|
641 |
$results_per_page = $hits if $results_per_page == 'all'; |
636 |
my $page = $cgi->param('page') || 0; |
642 |
my $page = $cgi->param('page') || 0; |
637 |
my @newresults; |
643 |
my @newresults; |
638 |
if ($build_grouped_results) { |
644 |
if ($build_grouped_results) { |
Lines 789-795
for (my $i=0;$i<@servers;$i++) {
Link Here
|
789 |
if ($query_desc || $limit_desc) { |
795 |
if ($query_desc || $limit_desc) { |
790 |
$template->param(searchdesc => 1); |
796 |
$template->param(searchdesc => 1); |
791 |
} |
797 |
} |
792 |
$template->param(results_per_page => $results_per_page); |
798 |
$template->param(results_per_page => $results_per_page == $hits ? 'all' : $results_per_page); |
793 |
my $hide = C4::Context->preference('OpacHiddenItems'); |
799 |
my $hide = C4::Context->preference('OpacHiddenItems'); |
794 |
$hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines |
800 |
$hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines |
795 |
my $branch = ''; |
801 |
my $branch = ''; |
796 |
- |
|
|