[Koha-cvs] koha/C4 Bookseller.pm

[Henri-Damien LAURENT]

CVSROOT:	/cvsroot/koha
Module name:	koha
Changes by:	Henri-Damien LAURENT <hdl>	07/07/20 14:31:36

Modified files:
	C4             : Bookseller.pm 

Log message:
	a query was not mysql5 compliant.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Bookseller.pm?cvsroot=koha&r1=1.2&r2=1.3

Patches:
Index: Bookseller.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bookseller.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Bookseller.pm	9 Mar 2007 14:31:47 -0000	1.2
+++ Bookseller.pm	20 Jul 2007 14:31:36 -0000	1.3
@@ -17,14 +17,14 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Bookseller.pm,v 1.2 2007/03/09 14:31:47 tipaul Exp $
+# $Id: Bookseller.pm,v 1.3 2007/07/20 14:31:36 hdl Exp $
 
 use strict;
 
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.2 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.3 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
 
 @ISA    = qw(Exporter);
 @EXPORT = qw(
@@ -107,20 +107,18 @@
     if ( $dbdriver eq "mysql" ) {
         $strsth = "
             SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
-            FROM aqorders, aqbasket
+            FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
             LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
-            WHERE aqorders.basketno = aqbasket.basketno
-                AND (closedate < DATE_SUB(CURDATE( ),INTERVAL $delay DAY)
+            WHERE (closedate < DATE_SUB(CURDATE( ),INTERVAL $delay DAY)
                 AND (datereceived = '' OR datereceived IS NULL))
         ";
     }
     else {
         $strsth = "
             SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
-            FROM aqorders, aqbasket
+            FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
             LEFT JOIN aqbooksellers ON aqbasket.aqbooksellerid = aqbooksellers.id
-            WHERE aqorders.basketno = aqbasket.basketno
-                AND (closedate < (CURDATE( )-(INTERVAL $delay DAY)))
+            WHERE (closedate < (CURDATE( )-(INTERVAL $delay DAY)))
                 AND (datereceived = '' OR datereceived IS NULL))
         ";
     }