[Koha-cvs] CVS: koha/C4 Catalogue.pm,1.38,1.39

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15487/C4

Modified Files:
	Catalogue.pm 
Log Message:
bugfix (wrong synch with rel_2_0)

Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** Catalogue.pm	11 Feb 2004 08:40:10 -0000	1.38
--- Catalogue.pm	20 Feb 2004 10:34:59 -0000	1.39
***************
*** 99,114 ****
    my ($basketno,$supplier)=@_;
    my $dbh = C4::Context->dbh;
!   my $sth=$dbh->prepare("Select *,biblio.title from aqorders,biblio,biblioitems
!   where basketno=?
    and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber
    =aqorders.biblioitemnumber
    and (datecancellationprinted is NULL or datecancellationprinted =
!   '0000-00-00')"
!   .(($supplier ne '')?" and aqorders.booksellerid=?":"")
!   ." group by aqorders.ordernumber");
!   if ($supplier ne '') {
!     $sth->execute($basketno,$supplier);
!   } else {
!     $sth->execute($basketno);
    }
    $query.=" order by biblioitems.publishercode";
--- 99,110 ----
    my ($basketno,$supplier)=@_;
    my $dbh = C4::Context->dbh;
!   my $query="Select *,biblio.title from aqorders,biblio,biblioitems
!   where basketno='$basketno'
    and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber
    =aqorders.biblioitemnumber
    and (datecancellationprinted is NULL or datecancellationprinted =
!   '0000-00-00')";
!   if ($supplier ne ''){
!     $query.=" and aqorders.booksellerid='$supplier'";
    }
    $query.=" order by biblioitems.publishercode";
***************
*** 119,126 ****
    my $i=0;
    while (my $data=$sth->fetchrow_hashref){
!     push(@results,$data);
    }
    $sth->finish;
!   return(scalar(@results), at results);
  }
  
--- 115,123 ----
    my $i=0;
    while (my $data=$sth->fetchrow_hashref){
!     $results[$i]=$data;
!     $i++;
    }
    $sth->finish;
!   return($i, at results);
  }