From e2b33cc4859b5ad272aa31740ff791412a9c1b1d Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 20 Feb 2004 10:34:59 +0000
Subject: [PATCH] bugfix (wrong synch with rel_2_0)

---
 C4/Catalogue.pm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/C4/Catalogue.pm b/C4/Catalogue.pm
index 7fbb1bb2fd..0d7135b11c 100644
--- a/C4/Catalogue.pm
+++ b/C4/Catalogue.pm
@@ -98,18 +98,14 @@ number of elements in C<@orders>.
 sub basket {
   my ($basketno,$supplier)=@_;
   my $dbh = C4::Context->dbh;
-  my $sth=$dbh->prepare("Select *,biblio.title from aqorders,biblio,biblioitems
-  where basketno=?
+  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')"
-  .(($supplier ne '')?" and aqorders.booksellerid=?":"")
-  ." group by aqorders.ordernumber");
-  if ($supplier ne '') {
-    $sth->execute($basketno,$supplier);
-  } else {
-    $sth->execute($basketno);
+  '0000-00-00')";
+  if ($supplier ne ''){
+    $query.=" and aqorders.booksellerid='$supplier'";
   }
   $query.=" order by biblioitems.publishercode";
   my $sth=$dbh->prepare($query);
@@ -118,10 +114,11 @@ sub basket {
 #  print $query;
   my $i=0;
   while (my $data=$sth->fetchrow_hashref){
-    push(@results,$data);
+    $results[$i]=$data;
+    $i++;
   }
   $sth->finish;
-  return(scalar(@results),@results);
+  return($i,@results);
 }
 
 =item newbasket
-- 
2.39.5