[Koha-cvs] koha catalogue/search.pl opac/opac-search.pl

[Joshua Ferraro]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Joshua Ferraro <kados>  07/03/13 13:01:51

Modified files:
        catalogue      : search.pl 
        opac           : opac-search.pl 

Log message:
        fixes page numbering for pages > 10 in search results

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-search.pl?cvsroot=koha&r1=1.39&r2=1.40

Patches:
Index: catalogue/search.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/search.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- catalogue/search.pl 9 Mar 2007 15:35:46 -0000       1.2
+++ catalogue/search.pl 13 Mar 2007 13:01:50 -0000      1.3
@@ -2,7 +2,7 @@
 # Script to perform searching
 # For documentation try 'perldoc /path/to/search'
 #
-# $Header: /sources/koha/koha/catalogue/search.pl,v 1.2 2007/03/09 15:35:46 
tipaul Exp $
+# $Header: /sources/koha/koha/catalogue/search.pl,v 1.3 2007/03/13 13:01:50 
kados Exp $
 #
 # Copyright 2006 LibLime
 #
@@ -437,8 +437,10 @@
                 my $this_offset = (($j*$results_per_page)-$results_per_page);
                 my $this_page_number = $j;
                 my $highlight = 1 if ($this_page_number == 
$current_page_number);
+                if ($this_page_number <= $pages) {
                 push @page_numbers, { offset => $this_offset, pg => 
$this_page_number, highlight => $highlight, sort_by => join " ",@sort_by };
             }
+            }
             $template->param(PAGE_NUMBERS => address@hidden,
                             previous_page_offset => $previous_page_offset,
                             next_page_offset => $next_page_offset) unless 
$pages < 2;

Index: opac/opac-search.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-search.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- opac/opac-search.pl 9 Mar 2007 15:12:54 -0000       1.39
+++ opac/opac-search.pl 13 Mar 2007 13:01:51 -0000      1.40
@@ -3,7 +3,7 @@
 # Script to perform searching
 # For documentation try 'perldoc /path/to/search'
 #
-# $Header: /sources/koha/koha/opac/opac-search.pl,v 1.39 2007/03/09 15:12:54 
tipaul Exp $
+# $Header: /sources/koha/koha/opac/opac-search.pl,v 1.40 2007/03/13 13:01:51 
kados Exp $
 #
 # Copyright 2006 LibLime
 #
@@ -489,6 +489,7 @@
                 my $this_page_number = $i;
                 my $highlight        = 1
                   if ( $this_page_number == $current_page_number );
+                if ($this_page_number <= $pages) {
                 push @page_numbers,
                   {
                     offset    => $this_offset,
@@ -498,6 +499,7 @@
                     @sort_by
                   };
             }
+            }
             $template->param(
                 PAGE_NUMBERS         => address@hidden,
                 previous_page_offset => $previous_page_offset,