[Koha-cvs] CVS: koha/C4 Biblio.pm,1.59,1.60

[Paul POULAIN]

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

Modified Files:
        Biblio.pm 
Log Message:
fix for 593 (data duplication in MARC-DB)

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** Biblio.pm   4 Sep 2003 10:17:07 -0000       1.59
--- Biblio.pm   4 Sep 2003 14:11:23 -0000       1.60
***************
*** 2,7 ****
  # $Id$
  # $Log$
! # Revision 1.59  2003/09/04 10:17:07  tipaul
! # fix for 583 (values in marc_word table should have quotation marks, etc, 
stripped)
  #
  # Revision 1.58  2003/08/06 12:54:52  tipaul
--- 2,7 ----
  # $Id$
  # $Log$
! # Revision 1.60  2003/09/04 14:11:23  tipaul
! # fix for 593 (data duplication in MARC-DB)
  #
  # Revision 1.58  2003/08/06 12:54:52  tipaul
***************
*** 558,561 ****
--- 558,562 ----
        my ($dbh,$record,$biblionumber,$bibid) = @_;
        my @fields=$record->fields();
+       warn "IN MARCaddbiblio $bibid => ".$record->as_formatted;
  # my $bibid;
  # adding main table, and retrieving bibid
***************
*** 966,972 ****
                                                
volumedate,volumeddesc,timestamp,illus,pages,notes AS bnotes,size,place
                                        FROM biblioitems
!                                       WHERE biblionumber=? and 
biblioitemnumber=?
                                        ");
!       $sth2->execute($biblionumber,$biblioitemnumber);
        my $row=$sth2->fetchrow_hashref;
        my $code;
--- 967,973 ----
                                                
volumedate,volumeddesc,timestamp,illus,pages,notes AS bnotes,size,place
                                        FROM biblioitems
!                                       WHERE biblioitemnumber=?
                                        ");
!       $sth2->execute($biblioitemnumber);
        my $row=$sth2->fetchrow_hashref;
        my $code;
***************
*** 1910,1918 ****
        my $bibnum=OLDnewbiblio($dbh,$biblio);
        # finds new (MARC bibid
!       my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$bibnum);
        my $record = &MARCkoha2marcBiblio($dbh,$bibnum);
        MARCaddbiblio($dbh,$record,$bibnum);
! # FIXME : MARC add
!   return($bibnum);
  }
  
--- 1911,1918 ----
        my $bibnum=OLDnewbiblio($dbh,$biblio);
        # finds new (MARC bibid
! #     my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$bibnum);
        my $record = &MARCkoha2marcBiblio($dbh,$bibnum);
        MARCaddbiblio($dbh,$record,$bibnum);
!       return($bibnum);
  }
  
***************
*** 2012,2023 ****
  
  sub newbiblioitem {
!   my ($biblioitem) = @_;
!   my $dbh   = C4::Context->dbh;
!   my $bibitemnum = &OLDnewbiblioitem($dbh,$biblioitem);
! #  print STDERR "bibitemnum : $bibitemnum\n";
!   my $MARCbiblio= 
MARCkoha2marcBiblio($dbh,$biblioitem->{biblionumber},$bibitemnum);
! #  print STDERR $MARCbiblio->as_formatted();
!   &MARCaddbiblio($dbh,$MARCbiblio,$biblioitem->{biblionumber});
!   return($bibitemnum);
  }
  
--- 2012,2022 ----
  
  sub newbiblioitem {
!       my ($biblioitem) = @_;
!       my $dbh   = C4::Context->dbh;
!       my $bibitemnum = &OLDnewbiblioitem($dbh,$biblioitem);
!       my $MARCbiblio= MARCkoha2marcBiblio($dbh,0,$bibitemnum); # the 0 means 
"do NOT retrieve biblio, only biblioitem, in the MARC record
!       my $bibid = 
&MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblioitem->{biblionumber});
!       &MARCaddbiblio($dbh,$MARCbiblio,$biblioitem->{biblionumber},$bibid);
!       return($bibitemnum);
  }