[Koha-cvs] koha acqui.simple/addbiblio.pl koha-tmpl/intran... [rel_2_2]

[Henri-Damien LAURENT]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Henri-Damien LAURENT <hdl>	06/08/31 14:07:18

Modified files:
	acqui.simple   : addbiblio.pl 
	koha-tmpl/intranet-tmpl/default/en/acqui.simple: addbiblio.tmpl 

Log message:
	Adding a new facility to tell how many new fields are needed when adding a field.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui.simple/addbiblio.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.52.2.51&r2=1.52.2.52
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.33.2.30&r2=1.33.2.31

Patches:
Index: acqui.simple/addbiblio.pl
===================================================================
RCS file: /sources/koha/koha/acqui.simple/Attic/addbiblio.pl,v
retrieving revision 1.52.2.51
retrieving revision 1.52.2.52
diff -u -b -r1.52.2.51 -r1.52.2.52
--- acqui.simple/addbiblio.pl	2 Aug 2006 12:52:46 -0000	1.52.2.51
+++ acqui.simple/addbiblio.pl	31 Aug 2006 14:07:18 -0000	1.52.2.52
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: addbiblio.pl,v 1.52.2.51 2006/08/02 12:52:46 kados Exp $
+# $Id: addbiblio.pl,v 1.52.2.52 2006/08/31 14:07:18 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -545,6 +545,8 @@
 } elsif ($op eq "addfield") {
 #------------------------------------------------------------------------------------------------------------------------------
 	my $addedfield = $input->param('addfield_field');
+	my $cntrepeatfield=$input->param('repeat_field');
+    $cntrepeatfield=1 unless ($cntrepeatfield);
 	my $tagaddfield_subfield = $input->param('addfield_subfield');
 	my @tags = $input->param('tag');
 	my @subfields = $input->param('subfield');
@@ -553,10 +555,18 @@
 	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, C4::Context->preference('TemplateEncoding'),C4::Context->preference('marcflavour'));
+    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'));
+	}
 	# adding an empty field
+	for (my $i=1;$i<=$cntrepeatfield;$i++){
 	my $field = MARC::Field->new("$addedfield",'','','$tagaddfield_subfield' => "");
 	$record->append_fields($field);
+    }
 	build_tabs ($template, $record, $dbh,$encoding);
 	build_hidden_data;
 	$template->param(

Index: koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.33.2.30
retrieving revision 1.33.2.31
diff -u -b -r1.33.2.30 -r1.33.2.31
--- koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl	31 Jul 2006 13:29:14 -0000	1.33.2.30
+++ koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl	31 Aug 2006 14:07:18 -0000	1.33.2.31
@@ -56,7 +56,7 @@
             <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
             <!-- TMPL_VAR NAME="tag_lib" -->
             <!-- /TMPL_UNLESS -->
-            <!-- TMPL_IF name="repeatable" --><a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
+            <!-- TMPL_IF name="repeatable" --><a href="#<!-- TMPL_VAR NAME="tag" -->" onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+</a><input type="hidden" name="repeat_field" value="" size="2" onchange="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" ><!-- /TMPL_IF -->
         </p>
         <!-- /TMPL_IF -->
         <!-- TMPL_LOOP NAME="subfield_loop" -->
@@ -301,7 +301,7 @@
 }
 
 
-function AddField(field) {
+function AddField(field,cntrepeatfield) {
 	document.forms['f'].op.value = "addfield";
 	document.forms['f'].addfield_field.value=field;
 	document.f.submit();