[Koha-cvs] koha/C4 Search.pm [rel_2_2]

[Chris Cormack]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Chris Cormack <rangi>   07/04/19 22:48:07

Modified files:
        C4             : Search.pm 

Log message:
        Fix so bibdata works with MySQL 5
        (Needed by reserves)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.99.2.17&r2=1.99.2.18

Patches:
Index: Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.17
retrieving revision 1.99.2.18
diff -u -b -r1.99.2.17 -r1.99.2.18
--- Search.pm   8 Feb 2007 11:03:31 -0000       1.99.2.17
+++ Search.pm   19 Apr 2007 22:48:07 -0000      1.99.2.18
@@ -30,7 +30,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.99.2.17 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.18 $' =~ /\d+/g;
           shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -1492,8 +1492,8 @@
     my $sth   = $dbh->prepare("
                  SELECT * , biblioitems.notes AS bnotes, biblio.notes
                 FROM biblio
-                LEFT JOIN biblioitems ON biblio.biblionumber = 
biblioitems.biblionumber
-                LEFT JOIN itemtypes ON biblioitems.itemtype = 
itemtypes.itemtype
+                LEFT JOIN (biblioitems) ON (biblio.biblionumber = 
biblioitems.biblionumber)
+                LEFT JOIN (itemtypes) ON (biblioitems.itemtype = 
itemtypes.itemtype)
                 WHERE biblio.biblionumber = ?
                 AND biblioitems.biblionumber = biblio.biblionumber ");
 
@@ -2355,8 +2355,8 @@
                         itemtypes.*,
                         MIN(items.itemlost)        as itemlost,
                         MIN(items.dateaccessioned) as dateaccessioned
-                          FROM biblioitems, items
-                          LEFT JOIN itemtypes ON biblioitems.itemtype = 
itemtypes.itemtype
+                          FROM items,biblioitems
+                          LEFT JOIN (itemtypes) ON (biblioitems.itemtype = 
itemtypes.itemtype)
                          WHERE biblioitems.biblionumber     = ?
                            AND biblioitems.biblioitemnumber = 
items.biblioitemnumber
                       GROUP BY items.biblioitemnumber");
@@ -2388,7 +2388,7 @@
     #called from request.pl
     my ($biblioitemnumber)address@hidden;
     my $dbh = C4::Context->dbh;
-    my $sth=$dbh->prepare("SELECT barcode, itemlost, holdingbranch FROM items
+    my $sth=$dbh->prepare("SELECT barcode, itemlost, holdingbranch,itemnumber 
FROM items
                            WHERE biblioitemnumber = ?
                              AND (wthdrawn <> 1 OR wthdrawn IS NULL)");
     $sth->execute($biblioitemnumber);