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

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        06/10/23 09:09:52

Modified files:
        C4             : Search.pm 

Log message:
        SQL Query in bibdata sub now compatible with mysql 5.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.120.2.12&r2=1.120.2.13

Patches:
Index: Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.120.2.12
retrieving revision 1.120.2.13
diff -u -b -r1.120.2.12 -r1.120.2.13
--- Search.pm   23 Oct 2006 08:54:03 -0000      1.120.2.12
+++ Search.pm   23 Oct 2006 09:09:52 -0000      1.120.2.13
@@ -40,7 +40,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.120.2.12 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.120.2.13 $' =~ /\d+/g;
           shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -934,7 +934,7 @@
                        $query="select *,biblio.author,biblio.biblionumber from
                                                        biblio
                                                        left join 
additionalauthors
-                                                       on 
additionalauthors.biblionumber =biblio.biblionumber
+                                                       on 
(additionalauthors.biblionumber =biblio.biblionumber)
                                                        where
                                                        ((biblio.author like ? 
or biblio.author like ? or
                                                        
additionalauthors.author like ? or additionalauthors.author
@@ -1005,7 +1005,7 @@
                                        my $i=1;
                                        $query="select 
biblio.biblionumber,author,title,unititle,notes,abstract,serial,seriestitle,copyrightdate,timestamp,subtitle
 from biblio
                                        left join bibliosubtitle on
-                                       
biblio.biblionumber=bibliosubtitle.biblionumber
+                                       
(biblio.biblionumber=bibliosubtitle.biblionumber)
                                        where
                                        (((title like ? or title like ?)";
                                        @bind=("$key[0]%","% $key[0]%");
@@ -1254,7 +1254,7 @@
        my ($env,$biblionumber,$type) = @_;
   my $dbh = C4::Context->dbh;
        my $query = "SELECT *,items.notforloan as itemnotforloan FROM items, 
biblio, biblioitems 
-                                       left join itemtypes on 
biblioitems.itemtype = itemtypes.itemtype
+                                       left join itemtypes on 
(biblioitems.itemtype = itemtypes.itemtype)
                                        WHERE items.biblionumber = ?
                                        AND biblioitems.biblioitemnumber = 
items.biblioitemnumber
                                        AND biblio.biblionumber = 
items.biblionumber";
@@ -1431,12 +1431,12 @@
 #'
 sub bibdata {
        my ($bibnum, $type) = @_;
+       
        my $dbh   = C4::Context->dbh;
        my $sth   = $dbh->prepare("Select *, biblioitems.notes AS bnotes, 
biblio.notes
                                                                from biblio, 
biblioitems
-                                                               left join 
bibliosubtitle on
-                                                               
biblio.biblionumber = bibliosubtitle.biblionumber
-                                                               left join 
itemtypes on biblioitems.itemtype=itemtypes.itemtype
+                                                               left join 
bibliosubtitle USING (biblionumber)
+                                                               left join 
itemtypes USING (itemtype)
                                                                where 
biblio.biblionumber = ?
                                                                and 
biblioitems.biblionumber = biblio.biblionumber");
        $sth->execute($bibnum);
@@ -1491,7 +1491,7 @@
 sub bibitemdata {
     my ($bibitem) = @_;
     my $dbh   = C4::Context->dbh;
-    my $sth   = $dbh->prepare("Select *,biblioitems.notes as bnotes from 
biblio, biblioitems,itemtypes where biblio.biblionumber = 
biblioitems.biblionumber and biblioitemnumber = ? and biblioitems.itemtype = 
itemtypes.itemtype");
+    my $sth   = $dbh->prepare("Select *,biblioitems.notes as bnotes from 
biblioitems, biblio,itemtypes where biblio.biblionumber = 
biblioitems.biblionumber and biblioitemnumber = ? and biblioitems.itemtype = 
itemtypes.itemtype");
     my $data;
 
     $sth->execute($bibitem);