[Koha-cvs] koha/cataloguing addbiblio.pl [rel_3_0]

[Henri-Damien LAURENT]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	06/09/05 21:31:55

Modified files:
	cataloguing    : addbiblio.pl 

Log message:
	BugFixing : template called was in acqui.simple. fixing to cataloguing

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbiblio.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.1&r2=1.14.2.2

Patches:
Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/addbiblio.pl,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -b -r1.14.2.1 -r1.14.2.2
--- addbiblio.pl	4 Sep 2006 09:15:47 -0000	1.14.2.1
+++ addbiblio.pl	5 Sep 2006 21:31:55 -0000	1.14.2.2
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: addbiblio.pl,v 1.14.2.1 2006/09/04 09:15:47 toins Exp $
+# $Id: addbiblio.pl,v 1.14.2.2 2006/09/05 21:31:55 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -31,7 +31,8 @@
 use C4::Koha; # XXX subfield_is_koha_internal_p
 use HTML::Template;
 use MARC::File::USMARC;
-use MARC::File::XML;
+use MARC::File::XML('BinaryEncoding'=>'utf8','RecordFormat' => 'UNIMARC' );
+use utf8;
 
 if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
 	MARC::File::XML->default_record_format( 'UNIMARC' );
@@ -422,7 +423,7 @@
 $frameworkcode = &MARCfind_frameworkcode($dbh,$biblionumber) if ($biblionumber and not ($frameworkcode));
 $frameworkcode='' if ($frameworkcode eq 'Default');
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui.simple/addbiblio.tmpl",
+    = get_template_and_user({template_name => "cataloguing/addbiblio.tmpl",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
@@ -485,8 +486,9 @@
 	# build indicator hash.
 	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 = MARChtml2marc(C4::Context->dbh,\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
+    warn "xml : ".$record->as_formatted;
+#     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');
@@ -535,12 +537,12 @@
 	my @indicator = $input->param('indicator');
 	my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
     my $record;
-    if (C4::Context->preference('TemplateEncoding') eq "iso-8859-1") {
-	    $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
-    } else {
-	    my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
-        $record=MARC::Record->new_from_xml($xml,C4::Context->preference('TemplateEncoding'),C4::Context->preference('marcflavour'));
-    }
+ if (C4::Context->preference('TemplateEncoding') eq "iso-8859-1") {
+	$record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
+} else {
+	my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
+$record=MARC::Record->new_from_xml($xml,C4::Context->preference('TemplateEncoding'),C4::Context->preference('marcflavour'));
+}
 	# adding an empty field
 	for (my $i=1;$i<=$cntrepeatfield;$i++){
 		my $field = MARC::Field->new("$addedfield",'','','$tagaddfield_subfield' => "");