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

[Henri-Damien LAURENT]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	06/09/25 14:46:22

Modified files:
	C4             : Biblio.pm 

Log message:
	Now using iso2709 MARC data for MARC.
	(Works better for accents than XML)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.178.2.7&r2=1.178.2.8

Patches:
Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.178.2.7
retrieving revision 1.178.2.8
diff -u -b -r1.178.2.7 -r1.178.2.8
--- Biblio.pm	20 Sep 2006 13:44:14 -0000	1.178.2.7
+++ Biblio.pm	25 Sep 2006 14:46:22 -0000	1.178.2.8
@@ -1,4 +1,4 @@
-package C4::Biblio;
+package C4::Biblio;
 # New subs added by tgarip at neu.edu.tr 05/11/05
 # Copyright 2000-2002 Katipo Communications
 #
@@ -28,6 +28,7 @@
 use Data::Dumper;
 use C4::Koha;
 use C4::Date;
+use utf8;
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
@@ -385,17 +386,11 @@
 sub MARCgetbiblio {
 	my ( $dbh, $bibid ) = @_;
 	my $dbh = C4::Context->dbh;
-	my $sth = $dbh->prepare("select marcxml from biblioitems where biblionumber=? "  );
+	my $sth = $dbh->prepare("select marc from biblioitems where biblionumber=? "  );
     $sth->execute($bibid);
-    my ($marcxml)=$sth->fetchrow;
-#     $marcxml =~ s/\x1e//g;
-#     $marcxml =~ s/\x1f//g;
-#     $marcxml =~ s/\x0f//g;
-#     $marcxml =~ s/\x1d//g;
-#     $marcxml =~ s/\x1b//g;
-#    $marcxml =~ s/\<subfield code="[A-Z><]"\>/\<subfield code="a"\>/g;
+    my ($marc)=$sth->fetchrow;
     my $record = MARC::Record->new();
-    $record = MARC::Record::new_from_xml( $marcxml,'utf8' ) if $marcxml;
+    $record = MARC::Record::new_from_usmarc( $marc ) if $marc;
 	return $record;
 }
 ############OLD VERSION HERE###############################################
@@ -3223,8 +3218,12 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.178.2.7 2006/09/20 13:44:14 hdl Exp $
+# $Id: Biblio.pm,v 1.178.2.8 2006/09/25 14:46:22 hdl Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.178.2.8  2006/09/25 14:46:22  hdl
+# Now using iso2709 MARC data for MARC.
+# (Works better for accents than XML)
+#
 # Revision 1.178.2.7  2006/09/20 13:44:14  hdl
 # Bug Fixing : Cataloguing was broken for UNIMARC.
 # Please test.