[Koha-cvs] CVS: koha/C4 Biblio.pm,1.33,1.34

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv3438/C4

Modified Files:
	Biblio.pm 
Log Message:
fixing MARCmodbiblio API and reindenting code

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** Biblio.pm	23 Jan 2003 12:22:37 -0000	1.33
--- Biblio.pm	28 Jan 2003 14:50:04 -0000	1.34
***************
*** 2,5 ****
--- 2,8 ----
  # $Id$
  # $Log$
+ # Revision 1.34  2003/01/28 14:50:04  tipaul
+ # fixing MARCmodbiblio API and reindenting code
+ #
  # Revision 1.33  2003/01/23 12:22:37  tipaul
  # adding char_decode to decode MARC21 or UNIMARC extended chars
***************
*** 325,329 ****
  Returns a MARC::Record for the biblio $bibid.
  
! =item &MARCmodbiblio($dbh,$bibid,$delete,$record);
  
  MARCmodbiblio changes a biblio for a biblio,MARC::Record passed as parameter
--- 328,332 ----
  Returns a MARC::Record for the biblio $bibid.
  
! =item &MARCmodbiblio($dbh,$bibid,$record,$delete);
  
  MARCmodbiblio changes a biblio for a biblio,MARC::Record passed as parameter
***************
*** 635,639 ****
  
  sub MARCmodbiblio {
!     my ($dbh,$record,$bibid,$itemnumber,$delete)=@_;
      my $oldrecord=&MARCgetbiblio($dbh,$bibid);
  #    warn "OLD : ".$oldrecord->as_formatted();
--- 638,643 ----
  
  sub MARCmodbiblio {
!     my ($dbh,$bibid,$record,$delete)=@_;
! #    my ($dbh,$record,$bibid,$itemnumber,$delete)=@_;
      my $oldrecord=&MARCgetbiblio($dbh,$bibid);
  #    warn "OLD : ".$oldrecord->as_formatted();
***************
*** 1092,1096 ****
  sub NEWmodbiblio {
  my ($dbh,$record,$bibid) =@_;
! &MARCmodbiblio($dbh,$record,$bibid);
  my $oldbiblio = MARCmarc2koha($dbh,$record);
  my $oldbiblionumber = OLDmodbiblio($dbh,$oldbiblio);
--- 1096,1100 ----
  sub NEWmodbiblio {
  my ($dbh,$record,$bibid) =@_;
! &MARCmodbiblio($dbh,$bibid,$record,0);
  my $oldbiblio = MARCmarc2koha($dbh,$record);
  my $oldbiblionumber = OLDmodbiblio($dbh,$oldbiblio);
***************
*** 1232,1264 ****
  
  sub OLDmodbiblio {
!     my ($dbh,$biblio) = @_;
! #  my $dbh   = C4Connect;
!     my $query;
!     my $sth;
! 
!     $biblio->{'title'}         = $dbh->quote($biblio->{'title'});
!     $biblio->{'author'}        = $dbh->quote($biblio->{'author'});
!     $biblio->{'abstract'}      = $dbh->quote($biblio->{'abstract'});
!     $biblio->{'copyrightdate'} = $dbh->quote($biblio->{'copyrightdate'});
!     $biblio->{'seriestitle'}   = $dbh->quote($biblio->{'serirestitle'});
!     $biblio->{'serial'}        = $dbh->quote($biblio->{'serial'});
!     $biblio->{'unititle'}      = $dbh->quote($biblio->{'unititle'});
!     $biblio->{'notes'}         = $dbh->quote($biblio->{'notes'});
  
!     $query = "Update biblio set
! title         = $biblio->{'title'},
! author        = $biblio->{'author'},
! abstract      = $biblio->{'abstract'},
! copyrightdate = $biblio->{'copyrightdate'},
! seriestitle   = $biblio->{'seriestitle'},
! serial        = $biblio->{'serial'},
! unititle      = $biblio->{'unititle'},
! notes         = $biblio->{'notes'}
! where biblionumber = $biblio->{'biblionumber'}";
!     $sth   = $dbh->prepare($query);
!     $sth->execute;
  
!     $sth->finish;
!     return($biblio->{'biblionumber'});
  } # sub modbiblio
  
--- 1236,1261 ----
  
  sub OLDmodbiblio {
! 	my ($dbh,$biblio) = @_;
! 	#  my $dbh   = C4Connect;
! 	my $query;
! 	my $sth;
  
! 	$biblio->{'title'}         = $dbh->quote($biblio->{'title'});
! 	$biblio->{'author'}        = $dbh->quote($biblio->{'author'});
! 	$biblio->{'abstract'}      = $dbh->quote($biblio->{'abstract'});
! 	$biblio->{'copyrightdate'} = $dbh->quote($biblio->{'copyrightdate'});
! 	$biblio->{'seriestitle'}   = $dbh->quote($biblio->{'serirestitle'});
! 	$biblio->{'serial'}        = $dbh->quote($biblio->{'serial'});
! 	$biblio->{'unititle'}      = $dbh->quote($biblio->{'unititle'});
! 	$biblio->{'notes'}         = $dbh->quote($biblio->{'notes'});
! 
! 	$query = "Update biblio set title         = ?, author        = ?, abstract      = ?, copyrightdate = ?,
! 					seriestitle   = ?, serial        = ?, unititle      = ?, notes         = ? where biblionumber = ?";
! 	$sth   = $dbh->prepare($query);
! 	$sth->execute($biblio->{'title'},$biblio->{'author'},$biblio->{'abstract'},$biblio->{'copyrightdate'},
! 						$biblio->{'seriestitle'},$biblio->{'serial'},$biblio->{'unititle'},$biblio->{'notes'},$biblio->{'biblionumber'});
  
! 	$sth->finish;
! 	return($biblio->{'biblionumber'});
  } # sub modbiblio
  
***************
*** 1817,1821 ****
      &OLDmodbibitem($dbh,$biblioitem);
      my $MARCbibitem = MARCkoha2marcBiblio($dbh,$biblioitem);
!     &MARCmodbiblio($dbh,$biblioitem->{biblionumber},0,$MARCbibitem);
  } # sub modbibitem
  
--- 1814,1818 ----
      &OLDmodbibitem($dbh,$biblioitem);
      my $MARCbibitem = MARCkoha2marcBiblio($dbh,$biblioitem);
!     &MARCmodbiblio($dbh,$biblioitem->{biblionumber},$MARCbibitem,0);
  } # sub modbibitem