[Koha-cvs] CVS: koha/C4 Biblio.pm,1.78.2.4,1.78.2.5 Catalogue.pm,1.36.2.2,1.36.2.3

[Ambrose C. LI]

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

Modified Files:
      Tag: rel_2_0
	Biblio.pm Catalogue.pm 
Log Message:
This should fix bug 727

If aqorderbreakdown is blank (i.e., the user ordered something before
they defined a bookfund), the "left join" allows existing data to still
be returned.

The data now display correctly. But the bookfund data still can't be
updated. I think that would count as a separate bug.


Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.78.2.4
retrieving revision 1.78.2.5
diff -C2 -r1.78.2.4 -r1.78.2.5
*** Biblio.pm	12 Feb 2004 13:41:56 -0000	1.78.2.4
--- Biblio.pm	6 Mar 2004 20:30:51 -0000	1.78.2.5
***************
*** 1657,1665 ****
    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;
--- 1657,1665 ----
    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;
***************
*** 2192,2195 ****
--- 2192,2205 ----
  # $Id$
  # $Log$
+ # Revision 1.78.2.5  2004/03/06 20:30:51  acli
+ # This should fix bug 727
+ #
+ # If aqorderbreakdown is blank (i.e., the user ordered something before
+ # they defined a bookfund), the "left join" allows existing data to still
+ # be returned.
+ #
+ # The data now display correctly. But the bookfund data still can't be
+ # updated. I think that would count as a separate bug.
+ #
  # Revision 1.78.2.4  2004/02/12 13:41:56  tipaul
  # deleting duplicated subs (by buggy copy/paste probably)

Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
diff -C2 -r1.36.2.2 -r1.36.2.3
*** Catalogue.pm	19 Feb 2004 10:16:31 -0000	1.36.2.2
--- Catalogue.pm	6 Mar 2004 20:30:51 -0000	1.36.2.3
***************
*** 471,479 ****
    my ($ordnum)=@_;
    my $dbh = C4::Context->dbh;
!   my $query="Select * from biblio,biblioitems,aqorders,aqorderbreakdown
    where aqorders.ordernumber='$ordnum'
    and biblio.biblionumber=aqorders.biblionumber and
!   biblioitems.biblioitemnumber=aqorders.biblioitemnumber and
!   aqorders.ordernumber=aqorderbreakdown.ordernumber";
    my $sth=$dbh->prepare($query);
    $sth->execute;
--- 471,479 ----
    my ($ordnum)=@_;
    my $dbh = C4::Context->dbh;
!   my $query="Select * from biblio,biblioitems,aqorders left join aqorderbreakdown
!   on aqorders.ordernumber=aqorderbreakdown.ordernumber
    where aqorders.ordernumber='$ordnum'
    and biblio.biblionumber=aqorders.biblionumber and
!   biblioitems.biblioitemnumber=aqorders.biblioitemnumber";
    my $sth=$dbh->prepare($query);
    $sth->execute;