(bug #4051) add due date in overdue.tmpl

[koha.git] / C4 / Bookseller.pm

diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm
index e5feff2..0153f2b 100644 (file)
--- a/C4/Bookseller.pm
+++ b/C4/Bookseller.pm
@@ -24,9 +24,10 @@ use vars qw($VERSION @ISA @EXPORT);
 BEGIN {
        # set the version for version checking
        $VERSION = 3.01;
+    require Exporter;
        @ISA    = qw(Exporter);
        @EXPORT = qw(
-               &GetBookSeller &GetBooksellersWithLateOrders
+               &GetBookSeller &GetBooksellersWithLateOrders &GetBookSellerFromId
                &ModBookseller
                &DelBookseller
                &AddBookseller
@@ -62,23 +63,22 @@ aqbooksellers table in the Koha database.
 
 =cut
 
-sub GetBookSeller {
+# FIXME: This function is badly named.  It should be something like 
+# SearchBookSellersByName.  It is NOT a singular return value.
+
+sub GetBookSeller($) {
     my ($searchstring) = @_;
     my $dbh = C4::Context->dbh;
-    my $query = "
-        SELECT *
-        FROM   aqbooksellers
-        WHERE  name LIKE ? OR id = ?
-    ";
+    my $query = "SELECT * FROM aqbooksellers WHERE name LIKE ? ";
     my $sth =$dbh->prepare($query);
-    $sth->execute("$searchstring%", $searchstring );
+    $sth->execute( "%$searchstring%");
     my @results;
     # count how many baskets this bookseller has.
     # if it has none, the bookseller can be deleted
-    my $sth2 = $dbh->prepare("select count(*) from aqbasket where booksellerid=?");
+    my $sth2 = $dbh->prepare("SELECT count(*) FROM aqbasket WHERE booksellerid=?");
     while ( my $data = $sth->fetchrow_hashref ) {
         $sth2->execute($data->{id});
-        ($data->{basketcount}) = $sth2->fetchrow();
+        $data->{basketcount} = $sth2->fetchrow();
         push( @results, $data );
     }
     $sth->finish;
@@ -86,6 +86,20 @@ sub GetBookSeller {
 }
 
 
+sub GetBookSellerFromId($) {
+       my ($id) = shift or return undef;
+       my $dbh = C4::Context->dbh();
+       my $query = "SELECT * FROM aqbooksellers WHERE id = ?";
+       my $sth =$dbh->prepare($query);
+       $sth->execute( $id );
+       if (my $data = $sth->fetchrow_hashref()){
+               my $sth2 = $dbh->prepare("SELECT count(*) FROM aqbasket WHERE booksellerid=?");
+               $sth2->execute($id);
+               $data->{basketcount}=$sth2->fetchrow();
+               return ($data);
+       }
+       return 0;
+}
 #-----------------------------------------------------------------#
 
 =head2 GetBooksellersWithLateOrders
@@ -97,7 +111,7 @@ Searches for suppliers with late orders.
 =cut
 
 sub GetBooksellersWithLateOrders {
-    my ($delay,$branch) = @_;
+    my ($delay,$branch) = @_;  # FIXME: Branch argument unused.
     my $dbh   = C4::Context->dbh;
 
 # FIXME NOT quite sure that this operation is valid for DBMs different from Mysql, HOPING so
@@ -182,6 +196,7 @@ sub AddBookseller {
     );
 
     # return the id of this new supplier
+    # FIXME: no protection against simultaneous addition: max(id) might be wrong!
     $query = "
         SELECT max(id)
         FROM   aqbooksellers
@@ -193,9 +208,9 @@ sub AddBookseller {
 
 #-----------------------------------------------------------------#
 
-=head2 ModSupplier
+=head2 ModBookseller
 
-&ModSupplier($bookseller);
+&ModBookseller($bookseller);
 
 Updates the information for a given bookseller. C<$bookseller> is a
 reference-to-hash whose keys are the fields of the aqbooksellers table