From cb6e87e42045448b4a339d65d28430b91778f3b4 Mon Sep 17 00:00:00 2001
From: doxulting <doxulting>
Date: Fri, 25 Jun 2004 09:17:49 +0000
Subject: [PATCH] debugged framework interface. Frameworks for ensmp are ready
 too

---
 admin/marc_subfields_structure.pl                          | 2 ++
 admin/marctagstructure.pl                                  | 2 +-
 .../default/en/parameters/marc_subfields_structure.tmpl    | 3 ++-
 .../default/en/parameters/marctagstructure.tmpl            | 7 ++++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index ab9e92e6a7..cbe15ea0c5 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -37,9 +37,11 @@ sub StringSearch  {
 	$sth->execute("$searchstring%",$frameworkcode);
 	my @results;
 	my $cnt=0;
+	my $u=1;
 	while (my $data=$sth->fetchrow_hashref){
 		push(@results,$data);
 		$cnt ++;
+		$u++;
 	}
 	$sth->finish;
 	$dbh->disconnect;
diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 5c805eaf49..5ab3d0ae5e 100755
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -290,7 +290,7 @@ sub duplicate_framework {
 	$sth->execute($oldframeworkcode);
 	$sth_insert = $dbh->prepare("insert into marc_subfield_structure (frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso) values (?,?,?,?,?,?,?,?,?,?,?,?,?)");
 	while ( my ($frameworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso) = $sth->fetchrow) {
-		$sth_insert->execute($newframeworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso);
+	    $sth_insert->execute($newframeworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso);
 	}
 }
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
index 17d18c8b7f..8ae0575146 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
@@ -70,6 +70,7 @@
 	<form action='<!-- TMPL_VAR name="delete_link" -->' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=searchfield value='<!-- TMPL_VAR name="searchfield" -->'>
 	<input type=hidden name=tagfield value='<!-- TMPL_VAR name="tagfield" -->'>
 	<input type=hidden name=tagsubfield value='<!-- TMPL_VAR name="tagsubfield" -->'>
+	<input type=hidden name="frameworkcode" value='<!-- TMPL_VAR name="frameworkcode" -->'>
 	<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
 	<tr><td><INPUT type=submit value='YES'></form></td><td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->"><input type=submit value=NO></form></td></tr>
 <!-- /TMPL_IF -->
@@ -127,7 +128,7 @@
 <!-- TMPL_VAR name="edit" -->
 	<img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0>
 </a>
-<a href="marctagstructure.pl?searchfield=<!-- TMPL_VAR name="tagfield" -->">
+<a href="marctagstructure.pl?searchfield=<!-- TMPL_VAR name="tagfield" -->&frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->">
 	<img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0>
 </a>
 <!-- TMPL_IF name="previous" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
index c3638e73c3..2f72a52b7d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
@@ -84,7 +84,7 @@
 		<td><!-- TMPL_VAR name="searchfield" --></td>
 	</tr>
 	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
-	<form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=searchfield value='<!-- TMPL_VAR name="searchfield" -->'>
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=searchfield value='<!-- TMPL_VAR name="searchfield" -->'><input type=hidden name=frameworkcode value='<!-- TMPL_VAR name="frameworkcode" -->'>
 	<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
 	<tr><td><INPUT type=submit value='YES'></form></td><td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value=NO></form></td></tr>
 <!-- /TMPL_IF -->
@@ -92,7 +92,7 @@
 <!-- TMPL_IF name="delete_confirmed" -->
 <!---------------------------------------------------------------------------->
 	Data deleted
-	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=hidden name=frameworkcode value='<!-- TMPL_VAR name="frameworkcode" -->'>
 	<input type=submit value=OK>
 	</form>
 <!-- /TMPL_IF -->
@@ -102,7 +102,7 @@
 		<input type="hidden" name="op" value="framework_create_confirm">
 		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR name="frameworkcode" -->">
 		Create framework for <!-- TMPL_VAR name="frameworkcode" --> (<!-- TMPL_VAR name="frameworktext" -->) using
-		<select name="existingfarmeworkcode">
+		<select name="existingframeworkcode">
 			<option value="">Default</option>
 		<!-- TMPL_LOOP name="existingframeworkloop" -->
 			<option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="frameworktext" --></option>
@@ -156,6 +156,7 @@
 	</table>
 	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 		<input type=hidden name=op value=add_form>
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR name="frameworkcode" -->">
 		<input type=submit class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
 		<!-- TMPL_IF name="isprevpage" -->
 			<a href="<!-- TMPL_VAR name="script_name" -->?offset=<!-- TMPL_VAR name="prevpage" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->">
-- 
2.20.1