[Koha-cvs] koha/acqui.simple addbiblio.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/04/06 02:15:35

Modified files:
	acqui.simple   : addbiblio.pl 

Log message:
	Fixes a bug that Paul noticed earlier today: UNIMARC tag/subfield labels
	were getting mangled when displayed in the MARC editor for edits.

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

Patches:
Index: koha/acqui.simple/addbiblio.pl
diff -u koha/acqui.simple/addbiblio.pl:1.52.2.35 koha/acqui.simple/addbiblio.pl:1.52.2.36
--- koha/acqui.simple/addbiblio.pl:1.52.2.35	Sun Apr  2 15:57:56 2006
+++ koha/acqui.simple/addbiblio.pl	Thu Apr  6 02:15:35 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: addbiblio.pl,v 1.52.2.35 2006/04/02 15:57:56 kados Exp $
+# $Id: addbiblio.pl,v 1.52.2.36 2006/04/06 02:15:35 kados Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -447,7 +447,7 @@
 	my @ind_tag = $input->param('ind_tag');
 	my @indicator = $input->param('indicator');
 	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');
 	# check for a duplicate
 	my ($duplicatebiblionumber,$duplicatebibid,$duplicatetitle) = FindDuplicate($record) if ($op eq "addbiblio") && (!$is_a_modif);
 	my $confirm_not_duplicate = $input->param('confirm_not_duplicate');
@@ -524,15 +524,15 @@
 		$bibid = "";
 		$oldbiblionumber= "";
 	}
-	unless ($record == -1) {
+	#unless ($record == -1) {
 	#FIXME: it's kind of silly to go from MARC::Record to MARC::File::XML and then back again just to fix the encoding
-	eval {
-        	my $uxml = $record->as_xml;
-		my $newrecord = MARC::Record::new_from_xml($uxml, 'UTF-8');
-		$record = $newrecord;
-	};
+	#eval {
+    #   	my $uxml = $record->as_xml;
+	#	my $newrecord = MARC::Record::new_from_xml($uxml, 'UTF-8');
+	#	$record = $newrecord;
+	#};
 
-	}
+	#}
 	build_tabs ($template, $record, $dbh,$encoding);
 	build_hidden_data;
 	$template->param(