[Koha-cvs] koha/C4 Biblio.pm [rel_2_2]

[Henri-Damien LAURENT]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Henri-Damien LAURENT <hdl>	07/05/29 13:13:33

Modified files:
	C4             : Biblio.pm 

Log message:
	Adding delete from subtitle in OLDdelbiblio

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.115.2.71&r2=1.115.2.72

Patches:
Index: Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.71
retrieving revision 1.115.2.72
diff -u -b -r1.115.2.71 -r1.115.2.72
--- Biblio.pm	30 Apr 2007 14:01:42 -0000	1.115.2.71
+++ Biblio.pm	29 May 2007 13:13:32 -0000	1.115.2.72
@@ -26,7 +26,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.115.2.71 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.115.2.72 $' =~ /\d+/g;
                     shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 @ISA = qw(Exporter);
@@ -1195,6 +1195,7 @@
 
 sub MARCmarc2koha {
 	my ($dbh,$record,$frameworkcode) = @_;
+	$dbh=C4::Context->dbh;
 	my $sth=$dbh->prepare("select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?");
 	my $result;
 	my $sth2=$dbh->prepare("SHOW COLUMNS from biblio");
@@ -1519,6 +1520,8 @@
     # delete from other koha tables
     $sth = $dbh->prepare("DELETE FROM bibliosubject WHERE biblionumber=?");
     $sth->execute($biblio);
+    $sth = $dbh->prepare("DELETE FROM bibliosubtitle WHERE biblionumber=?");
+    $sth->execute($biblio);
     $sth = $dbh->prepare("DELETE FROM additionalauthors WHERE biblionumber=?");
     $sth->execute($biblio);
     &MARCdelbiblio( $dbh, $bibid, 0 );
@@ -2614,6 +2617,7 @@
         s/\xf3/ð/gm;
         s/\xf9/ø/gm;
         s/\xfb/ß/gm;
+        s/\x80/ Euros/gm;
         s/\xc1\x61/Ã /gm;
         s/\xc1\x65/è/gm;
         s/\xc1\x69/ì/gm;
@@ -3036,8 +3040,11 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.115.2.71 2007/04/30 14:01:42 tipaul Exp $
+# $Id: Biblio.pm,v 1.115.2.72 2007/05/29 13:13:32 hdl Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.115.2.72  2007/05/29 13:13:32  hdl
+# Adding delete from subtitle in OLDdelbiblio
+#
 # Revision 1.115.2.71  2007/04/30 14:01:42  tipaul
 # I switched my desktop to mandriva 2007.1 with UTF-8 enabled, and it seems that caused some problems, once again in Biblio.pm char_decode sub.
 #