[Koha-cvs] CVS: koha/search.marc search.pl,1.17,1.18

[Paul POULAIN]

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18662/search.marc

Modified Files:
        search.pl 
Log Message:
fixing a complex bug : the last results didn't have callnumber informations. 
Had to rewrite algorythm for building the result array.

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/search.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** search.pl   13 Aug 2004 16:44:31 -0000      1.17
--- search.pl   20 Aug 2004 08:19:52 -0000      1.18
***************
*** 145,149 ****
        my $displaynext=0;
        my $displayprev=$startfrom;
!       if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
                $displaynext = 1;
        }
--- 145,149 ----
        my $displaynext=0;
        my $displayprev=$startfrom;
!       if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
                $displaynext = 1;
        }
***************
*** 151,157 ****
        my @field_data = ();
  
! 
!       for(my $i = 0 ; $i <= $#marclist ; $i++)
!       {
                push @field_data, { term => "marclist", val=>$marclist[$i] };
                push @field_data, { term => "and_or", val=>$and_or[$i] };
--- 151,155 ----
        my @field_data = ();
  
!       for(my $i = 0 ; $i <= $#marclist ; $i++) {
                push @field_data, { term => "marclist", val=>$marclist[$i] };
                push @field_data, { term => "and_or", val=>$and_or[$i] };
***************
*** 163,172 ****
        my @numbers = ();
  
!       if ($total>$resultsperpage)
!       {
!               for (my $i=1; $i<$total/$resultsperpage+1; $i++)
!               {
!                       if ($i<16)
!                       {
                        my $highlight=0;
                        ($startfrom==($i-1)) && ($highlight=1);
--- 161,167 ----
        my @numbers = ();
  
!       if ($total>$resultsperpage) {
!               for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
!                       if ($i<16) {
                        my $highlight=0;
                        ($startfrom==($i-1)) && ($highlight=1);