[Koha-cvs] CVS: koha/C4 Biblio.pm,1.81,1.82 Catalogue.pm,1.39,1.40

[Ambrose C. LI]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28866/C4

Modified Files:
	Biblio.pm Catalogue.pm 
Log Message:
Various updates/fixes from rel_2_0
Fixes for bugs 721 (templating), 727, and 734


Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** Biblio.pm	6 Mar 2004 20:26:13 -0000	1.81
--- Biblio.pm	7 Mar 2004 05:47:31 -0000	1.82
***************
*** 1659,1667 ****
    my ($ordnum)=@_;
    my $dbh = C4::Context->dbh;
!   my $sth=$dbh->prepare("Select * from biblio,biblioitems,aqorders,aqorderbreakdown
    where aqorders.ordernumber=?
!   and biblio.biblionumber=aqorders.biblionumber and
!   biblioitems.biblioitemnumber=aqorders.biblioitemnumber and
!   aqorders.ordernumber=aqorderbreakdown.ordernumber");
    $sth->execute($ordnum);
    my $data=$sth->fetchrow_hashref;
--- 1659,1667 ----
    my ($ordnum)=@_;
    my $dbh = C4::Context->dbh;
!   my $sth=$dbh->prepare("Select * from biblio,biblioitems,aqorders left join aqorderbreakdown
!   on aqorders.ordernumber=aqorderbreakdown.ordernumber
    where aqorders.ordernumber=?
!   and biblio.biblionumber=aqorders.biblionumber
!   and biblioitems.biblioitemnumber=aqorders.biblioitemnumber");
    $sth->execute($ordnum);
    my $data=$sth->fetchrow_hashref;
***************
*** 2194,2197 ****
--- 2194,2201 ----
  # $Id$
  # $Log$
+ # Revision 1.82  2004/03/07 05:47:31  acli
+ # Various updates/fixes from rel_2_0
+ # Fixes for bugs 721 (templating), 727, and 734
+ #
  # Revision 1.81  2004/03/06 20:26:13  tipaul
  # adding seealso feature in MARC searches

Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** Catalogue.pm	20 Feb 2004 10:34:59 -0000	1.39
--- Catalogue.pm	7 Mar 2004 05:47:31 -0000	1.40
***************
*** 265,269 ****
    $sth=$dbh->prepare("update aqorderbreakdown set bookfundid=? where
    ordernumber=?");
!   $sth->execute($bookfund,$ordnum);
    $sth->finish;
  }
--- 265,273 ----
    $sth=$dbh->prepare("update aqorderbreakdown set bookfundid=? where
    ordernumber=?");
!   if ($sth->execute($bookfund,$ordnum) == 0) { # zero rows affected [Bug 734]
!     $query="insert into aqorderbreakdown (ordernumber,bookfundid) values (?,?)";
!     $sth=$dbh->prepare($query);
!     $sth->execute($ordnum,$bookfund);
!   }
    $sth->finish;
  }
***************
*** 451,459 ****
    my ($ordnum)=@_;
    my $dbh = C4::Context->dbh;
!   my $sth=$dbh->prepare("Select * from biblio,biblioitems,aqorders,aqorderbreakdown
    where aqorders.ordernumber=?
    and biblio.biblionumber=aqorders.biblionumber and
!   biblioitems.biblioitemnumber=aqorders.biblioitemnumber and
!   aqorders.ordernumber=aqorderbreakdown.ordernumber");
    $sth->execute($ordnum);
    my $data=$sth->fetchrow_hashref;
--- 455,463 ----
    my ($ordnum)=@_;
    my $dbh = C4::Context->dbh;
!   my $sth=$dbh->prepare("Select * from biblio,biblioitems,aqorders left join aqorderbreakdown
!   on aqorders.ordernumber=aqorderbreakdown.ordernumber
    where aqorders.ordernumber=?
    and biblio.biblionumber=aqorders.biblionumber and
!   biblioitems.biblioitemnumber=aqorders.biblioitemnumber");
    $sth->execute($ordnum);
    my $data=$sth->fetchrow_hashref;