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

[Henri-Damien LAURENT]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch: 	rel_2_2
Changes by:	Henri-Damien LAURENT <hdl at savannah.gnu.org>	06/03/07 08:34:54

Modified files:
	acqui.simple   : additem.pl 

Log message:
	BugFixing : the latest commit on new items made an error on the additem (inserted a diff line): corrected
	When ppl donot input utf-8 data, display is strange.

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.15&tr2=1.27.2.16&r1=text&r2=text

Patches:
Index: koha/acqui.simple/additem.pl
diff -u koha/acqui.simple/additem.pl:1.27.2.15 koha/acqui.simple/additem.pl:1.27.2.16
--- koha/acqui.simple/additem.pl:1.27.2.15	Mon Mar  6 03:41:36 2006
+++ koha/acqui.simple/additem.pl	Tue Mar  7 08:34:54 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: additem.pl,v 1.27.2.15 2006/03/06 03:41:36 kados Exp $
+# $Id: additem.pl,v 1.27.2.16 2006/03/07 08:34:54 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -80,11 +80,7 @@
 	#	$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')) {