[Koha-cvs] CVS: koha/C4 Biblio.pm,1.115.2.4,1.115.2.5

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
	Biblio.pm 
Log Message:
exporting MARCdelsubfield sub. It's used in authority merging.
Modifying it too to enable deletion of all subfields from a given tag/subfield or just one.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.4
retrieving revision 1.115.2.5
diff -C2 -r1.115.2.4 -r1.115.2.5
*** Biblio.pm	17 Feb 2005 12:44:25 -0000	1.115.2.4
--- Biblio.pm	24 Feb 2005 13:54:04 -0000	1.115.2.5
***************
*** 67,70 ****
--- 67,71 ----
    &MARCgetbiblio &MARCgetitem
    &MARCaddword &MARCdelword
+   &MARCdelsubfield
    &char_decode
    
***************
*** 202,205 ****
--- 203,207 ----
  
  MARCdelsubfield delete a subfield for a bibid/tag/tagorder/subfield/subfieldorder
+ If $subfieldorder is not set, delete all the $tag$subfield subfields 
  
  =item &MARCdelbiblio($dbh,$bibid);
***************
*** 879,887 ****
      # delete a subfield for $bibid / tag / tagorder / subfield / subfieldorder
      my ( $dbh, $bibid, $tag, $tagorder, $subfield, $subfieldorder ) = @_;
!     $dbh->do( "delete from marc_subfield_table where bibid='$bibid' and
! 			tag='$tag' and tagorder='$tagorder'
! 			and subfieldcode='$subfield' and subfieldorder='$subfieldorder'
! 			"
!     );
  }
  
--- 881,904 ----
      # delete a subfield for $bibid / tag / tagorder / subfield / subfieldorder
      my ( $dbh, $bibid, $tag, $tagorder, $subfield, $subfieldorder ) = @_;
! 	if ($subfieldorder) {
! 		$dbh->do( "delete from marc_subfield_table where bibid='$bibid' and
! 				tag='$tag' and tagorder='$tagorder'
! 				and subfieldcode='$subfield' and subfieldorder='$subfieldorder'
! 				"
! 		);
! 		$dbh->do( "delete from marc_word where bibid='$bibid' and
! 				tagsubfield='$tag$subfield' and tagorder='$tagorder'
! 				and subfieldorder='$subfieldorder'
! 				"
! 		);
! 	} else {
! 		$dbh->do( "delete from marc_subfield_table where bibid='$bibid' and
! 				tag='$tag' and tagorder='$tagorder'
! 				and subfieldcode='$subfield'"
! 		);
! 		$dbh->do( "delete from marc_word where bibid='$bibid' and
! 				tagsubfield='$tag$subfield' and tagorder='$tagorder'"
! 		);
! 	}
  }
  
***************
*** 2637,2640 ****
--- 2654,2661 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.5  2005/02/24 13:54:04  tipaul
+ # exporting MARCdelsubfield sub. It's used in authority merging.
+ # Modifying it too to enable deletion of all subfields from a given tag/subfield or just one.
+ #
  # Revision 1.115.2.4  2005/02/17 12:44:25  tipaul
  # bug in acquisition : the title was also stored as subtitle.