[Koha-cvs] koha/acqui.simple additem.pl [rel_2_2]

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch: 	rel_2_2
Changes by:	Joshua Ferraro <kados at savannah.gnu.org>	06/03/06 03:41:36

Modified files:
	acqui.simple   : additem.pl 

Log message:
	re-adding ''

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/acqui.simple/additem.pl.diff?only_with_tag=rel_2_2&tr1=1.27.2.14&tr2=1.27.2.15&r1=text&r2=text

Patches:
Index: koha/acqui.simple/additem.pl
diff -u koha/acqui.simple/additem.pl:1.27.2.14 koha/acqui.simple/additem.pl:1.27.2.15
--- koha/acqui.simple/additem.pl:1.27.2.14	Sat Mar  4 17:10:48 2006
+++ koha/acqui.simple/additem.pl	Mon Mar  6 03:41:36 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: additem.pl,v 1.27.2.14 2006/03/04 17:10:48 kados Exp $
+# $Id: additem.pl,v 1.27.2.15 2006/03/06 03:41:36 kados Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -80,7 +80,11 @@
 	#	$indicators{$ind_tag[$i]} = $indicator[$i];
 	#}
 	my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
+<<<<<<< additem.pl
+        my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
+=======
         my $record=MARC::Record::new_from_xml($xml, UTF-8);
+>>>>>>> 1.27.2.14
 	#my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
 	# if autoBarcode is ON, calculate barcode...
 	if (C4::Context->preference('autoBarcode')) {
@@ -138,7 +142,7 @@
 	#	$indicators{$ind_tag[$i]} = $indicator[$i];
 	#}
 	my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
-        my $record=MARC::Record::new_from_xml($xml, UTF-8);
+        my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
 	#my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
 # MARC::Record builded => now, record in DB
 # warn "R: ".$record->as_formatted;