Encoding ampersand

[koha.git] / opac / opac-searchresults.pl

diff --git a/opac/opac-searchresults.pl b/opac/opac-searchresults.pl
index 6c4d80c..bf2de2c 100755 (executable)
--- a/opac/opac-searchresults.pl
+++ b/opac/opac-searchresults.pl
@@ -14,7 +14,6 @@ my ($template, $borrowernumber, $cookie)
                             query => $query,
                             type => "opac",
                             authnotrequired => 1,
-                            flagsrequired => {borrow => 1},
                         });
 
 
@@ -30,8 +29,6 @@ if ($subject) {
 # we assume that C4::Search will validate these values for us
 my @fields = ('keyword', 'subject', 'author', 'illustrator', 'itemnumber', 'isbn', 'date-before', 'date-after', 'class', 'dewey', 'branch', 'title', 'abstract', 'publisher');
 
-
-
 # collect all the fields ...
 my %search;
 
@@ -102,7 +99,7 @@ $template->param(startfrom => $startfrom+1);
 ($startfrom+$num<=$count) ? ($template->param(endat => $startfrom+$num)) : ($template->param(endat => $count));
 $template->param(numrecords => $count);
 my $nextstartfrom=($startfrom+$num<$count) ? ($startfrom+$num) : (-1);
-my $prevstartfrom=($startfrom-$num>=0) ? ($startfrom-$num) : (-1);
+my $prevstartfrom=($startfrom-$num>=0) ? ($startfrom-$number_of_results) : (-1);
 $template->param(nextstartfrom => $nextstartfrom);
 my $displaynext=($nextstartfrom==-1) ? 0 : 1;
 my $displayprev=($prevstartfrom==-1) ? 0 : 1;
@@ -115,15 +112,17 @@ $template->param(SEARCH_RESULTS => $resultsarray);
 
 my $numbers;
 @$numbers = ();
-if ($count>10) {
-    for (my $i=1; $i<$count/10+1; $i++) {
+if ($count>$number_of_results) {
+    for (my $i=1; $i<$count/$number_of_results+1; $i++) {
        my $highlight=0;
        my $themelang = $template->param('themelang');
-       ($startfrom==($i-1)*10) && ($highlight=1);
-       push @$numbers, { number => $i, highlight => $highlight , startfrom => ($i-1)*10 };
+       ($startfrom==($i-1)*$number_of_results+1) && ($highlight=1);
+       push @$numbers, { number => $i, highlight => $highlight , startfrom => ($i-1)*$number_of_results+1 };
     }
 }
 
-$template->param(numbers => $numbers);
+$template->param(numbers => $numbers,
+                            LibraryName => C4::Context->preference("LibraryName"),
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;