From 0dcc307725fd533a0b87609b1452e84f4d2ba16a Mon Sep 17 00:00:00 2001
From: kados <kados>
Date: Sat, 25 Feb 2006 02:05:59 +0000
Subject: [PATCH] MAJOR BUGFIX: previously, when adding a tag, subfield order
 always started with 'a' because that was hardcoded into the script. Now,
 order is governed by the first defined subfield in the framework.

---
 acqui.simple/addbiblio.pl                                   | 5 ++++-
 .../intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl    | 4 +++-
 koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl  | 6 ++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/acqui.simple/addbiblio.pl b/acqui.simple/addbiblio.pl
index f79b79c0d0..15ad948a2e 100755
--- a/acqui.simple/addbiblio.pl
+++ b/acqui.simple/addbiblio.pl
@@ -305,6 +305,7 @@ sub build_tabs ($$$$) {
 					$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
 					$tag_data{indicator} = $indicator;
 					$tag_data{subfield_loop} = \@subfields_data;
+					$tag_data{tagfirstsubfield} = $tag_data{subfield_loop}[0];
 					push (@loop_data, \%tag_data);
 				}
 			}
@@ -469,6 +470,7 @@ if ($op eq "addbiblio") {
 } elsif ($op eq "addfield") {
 #------------------------------------------------------------------------------------------------------------------------------
 	my $addedfield = $input->param('addfield_field');
+	my $tagaddfield_subfield = $input->param('addfield_subfield');
 	my @tags = $input->param('tag');
 	my @subfields = $input->param('subfield');
 	my @values = $input->param('field_value');
@@ -481,7 +483,8 @@ if ($op eq "addbiblio") {
 	}
 	my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
 	# adding an empty field
-	my $field = MARC::Field->new("$addedfield",'','','a'=> "");
+	my $tagslib = &MARCgettagslib($dbh,1,$frameworkcode);
+	my $field = MARC::Field->new("$addedfield",'','','$tagaddfield_subfield' => "");
 	$record->append_fields($field);
 	build_tabs ($template, $record, $dbh,$encoding);
 	build_hidden_data;
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
index 54ebd37f04..fc84d7a776 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
@@ -4,6 +4,7 @@
 	<h1 class="catalogue">Biblionumber : <!-- TMPL_VAR NAME="oldbiblionumber" -->     With Framework :<!--TMPL_VAR Name="framework" --></b></h1>
 	<p>
 		<input type="hidden" name="op" value="addbiblio">
+		<input type="hidden" name="addfield_subfield">
 		<input type="hidden" name="addfield_field">
 		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
 		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
@@ -622,9 +623,10 @@ function Changefwk(FwkList) {
   window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
 }
 
-function AddField(field) {
+function AddField(field,subfield) {
 	document.forms['f'].op.value = "addfield";
 	document.forms['f'].addfield_field.value=field;
+	document.forms['f'].addfield_subfield.value=subfield;
 	document.f.submit();
 }
 
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl
index 07f5f8c725..2b148ae1fb 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl
@@ -17,6 +17,7 @@
 
 <div class="tabitem">		<input type="hidden" name="op" value="addbiblio" />
 		<input type="hidden" name="addfield_field" />
+		<input type="hidden" name="addfield_subfield" />
 		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
 		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->" />
 		<!-- TMPL_IF name="bibid" -->
@@ -83,7 +84,7 @@
 				<!-- /TMPL_UNLESS -->
 				<!-- TMPL_VAR NAME="tag_lib" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR NAME="tagfirstsubfield"-->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -668,9 +669,10 @@ function Changefwk(FwkList) {
   window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
 }
 
-function AddField(field) {
+function AddField(field,subfield) {
 	document.forms['f'].op.value = "addfield";
 	document.forms['f'].addfield_field.value=field;
+	document.forms['f'].addfield_subfield.value=subfield;
 	document.f.submit();
 }
 
-- 
2.39.5