From b1136e8813094198e004b39cef55944edfd4b339 Mon Sep 17 00:00:00 2001
From: doxulting <doxulting>
Date: Thu, 8 Jul 2004 10:15:59 +0000
Subject: [PATCH] Authorities

---
 admin/marc_subfields_structure.pl             |  1 +
 authorities/auth_finder.pl                    |  5 +--
 .../default/en/authorities/auth_finder.tmpl   | 10 ++----
 .../blinddetail-biblio-search.tmpl            | 34 ++++++++++++++-----
 .../en/authorities/detail-biblio-search.tmpl  | 34 ++++++++++++++-----
 5 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index 9944bf37e9..a19d2cec08 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -164,6 +164,7 @@ if ($op eq 'add_form') {
 					-size=>1,
 					-multiple=>0,
 					);
+		warn "ATTENTION ---+--- $data->{'link'}";
 		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type='hidden' name='tagsubfield' value='".$data->{'tagsubfield'}."'>";
 		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
 		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
diff --git a/authorities/auth_finder.pl b/authorities/auth_finder.pl
index baa9ffbb50..cb2c58152a 100755
--- a/authorities/auth_finder.pl
+++ b/authorities/auth_finder.pl
@@ -37,6 +37,7 @@ my $query=new CGI;
 my $op = $query->param('op');
 my $authtypecode = $query->param('authtypecode');
 my $index = $query->param('index');
+my $category = $query->param('category');
 my $dbh = C4::Context->dbh;
 
 my $startfrom=$query->param('startfrom');
@@ -83,6 +84,7 @@ if ($op eq "do_search") {
 				flagsrequired => {catalogue => 1},
 				debug => 1,
 				});
+
 	# multi page display gestion
 	my $displaynext=0;
 	my $displayprev=$startfrom;
@@ -131,7 +133,6 @@ if ($op eq "do_search") {
 	}
 	$template->param(result => $results) if $results;
 	$template->param(index => $query->param('index'));
-	warn "ici query $index  $query->param('resultsperpage')" ;
 	$template->param(startfrom=> $startfrom,
 							displaynext=> $displaynext,
 							displayprev=> $displayprev,
@@ -146,7 +147,6 @@ if ($op eq "do_search") {
 							numbers=>\@numbers,
 							);
 } else {
-	warn "Je suis la de base $index\n";
 	($template, $loggedinuser, $cookie)
 		= get_template_and_user({template_name => "authorities/auth_finder.tmpl",
 				query => $query,
@@ -160,6 +160,7 @@ if ($op eq "do_search") {
 }
 
 $template->param(authtypesloop => \@authtypesloop);
+$template->param(category => $category);
 
 # Print the page
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl
index d2b7fd940f..0a0d7d9a96 100644
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl
@@ -11,18 +11,12 @@
 		<h2 class="authority">Search on</h2>
 		<p>
 			<label class="label100">Authority type</label>
-			<select name="authtypecode">
-			<!-- TMPL_LOOP name="authtypesloop" -->
-				<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
-					<!-- TMPL_VAR name="authtypetext" -->
-				</option>
-			<!-- /TMPL_LOOP -->
-			</select>
+			<!-- TMPL_VAR name="category" -->
 		</p>
 		<p>
 			<label class="label100">Search value</label>
 			<input type="text" name="value" value="<!-- TMPL_VAR name="value" -->">
-			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
+			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="category" -->">
 			<input type="hidden" name="marclist" value="">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
index 07ff6ee062..4229180f58 100644
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
@@ -4,17 +4,35 @@
 
 function go()
 {
-var val = 0;
-	opener.opener.document.f.field_value[<!-- TMPL_VAR name="index" --> - 2].value = <!-- TMPL_VAR name="authid" -->;
-	<!-- TMPL_LOOP name="0XX" -->
-		<!-- TMPL_LOOP name="subfield" -->
-	opener.opener.document.f.field_value[<!-- TMPL_VAR name="index" --> + val].value = '<!-- TMPL_VAR name="marc_value" -->';
-	val += 1;
-		<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
+var index_start = <!-- TMPL_VAR name="index" -->;
+opener.opener.document.f.field_value[index_start].value = '<!-- TMPL_VAR name="authid">';
+var whichfield = opener.opener.document.f.tag[index_start].value;
+for (i=index_start ; i<opener.opener.document.f.field_value.length ; i++) {
+
+if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') 
+	{
+		opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR name="authid">';
+	}
+
+}
+<!-- TMPL_LOOP name="0XX" -->
+   <!-- TMPL_LOOP name="subfield" -->
+for (i=index_start ; i<opener.opener.document.f.field_value.length ; i++) {
+
+if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR name="marc_subfield" -->') 
+	{
+		opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR name="marc_value" -->';
+	}
+
+}
+	
+   <!-- /TMPL_LOOP -->
+<!-- /TMPL_LOOP -->
 	opener.close();
 	self.close();
 	return false;
+
+
 }
 </script>
 <script>
diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl
index 6d1eaf0072..c1670acb28 100644
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl
@@ -49,18 +49,36 @@ function Dopop(link) {
 
 function CopyValues()
 {
-var val = 0;
+var index_start = <!-- TMPL_VAR name="index" -->;
+opener.opener.document.f.field_value[index_start].value = '<!-- TMPL_VAR name="authid">';
+var whichfield = opener.opener.document.f.tag[index_start].value;
+for (i=index_start ; i<opener.opener.document.f.field_value.length ; i++) {
 
-	opener.opener.document.f.field_value[<!-- TMPL_VAR name="index" --> - 2].value = '<!-- TMPL_VAR name="authid" -->';
-	<!-- TMPL_LOOP name="0XX" -->
-		<!-- TMPL_LOOP name="subfield" -->
-	opener.opener.document.f.field_value[<!-- TMPL_VAR name="index" --> + val].value = '<!-- TMPL_VAR name="marc_value" -->';
-	val += 1;
-		<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
+if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') 
+	{
+		opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR name="authid">';
+	}
+
+}
+
+
+<!-- TMPL_LOOP name="0XX" -->
+   <!-- TMPL_LOOP name="subfield" -->
+for (i=index_start ; i<opener.opener.document.f.field_value.length ; i++) {
+
+if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR name="marc_subfield" -->') 
+	{
+		opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR name="marc_value" -->';
+	}
+
+}
+	
+   <!-- /TMPL_LOOP -->
+<!-- /TMPL_LOOP -->
 	opener.close();
 	self.close();
 	return false;
+	
 }
 
 </script>
-- 
2.39.5