[Koha-cvs] koha/intranet/cgi-bin/authorities auth_finder.p... [rel_TG]

Tumer Garip tgarip at neu.edu.tr
Sat Mar 10 02:10:53 CET 2007


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_TG
Changes by:	Tumer Garip <tgarip1957>	07/03/10 01:10:53

Added files:
	intranet/cgi-bin/authorities: auth_finder.pl auth_linker.pl 
	                              authorities-home.pl authorities.pl 
	                              blinddetail-biblio-search.pl 
	                              blinddetail-linker.pl 
	                              detail-biblio-search.pl detail.pl 
	                              merge_authority.pl 

Log message:
	fresh files for rel_TG

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/auth_finder.pl?cvsroot=koha&only_with_tag=rel_TG&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/auth_linker.pl?cvsroot=koha&only_with_tag=rel_TG&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/authorities-home.pl?cvsroot=koha&only_with_tag=rel_TG&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/authorities.pl?cvsroot=koha&only_with_tag=rel_TG&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/blinddetail-biblio-search.pl?cvsroot=koha&only_with_tag=rel_TG&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/blinddetail-linker.pl?cvsroot=koha&only_with_tag=rel_TG&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/detail-biblio-search.pl?cvsroot=koha&only_with_tag=rel_TG&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/detail.pl?cvsroot=koha&only_with_tag=rel_TG&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/merge_authority.pl?cvsroot=koha&only_with_tag=rel_TG&rev=1.1.2.1

Patches:
Index: auth_finder.pl
===================================================================
RCS file: auth_finder.pl
diff -N auth_finder.pl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ auth_finder.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
@@ -0,0 +1,157 @@
+#!/usr/bin/perl
+# WARNING: 4-character tab stops here
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+use strict;
+
+use CGI;
+use C4::Auth;
+use C4::Context;
+use C4::Search;
+use C4::Interface::CGI::Output;
+use C4::AuthoritiesMarc;
+use C4::Koha; # XXX subfield_is_koha_internal_p
+
+my $query=new CGI;
+my $op = $query->param('op');
+my $authtypecode = $query->param('authtypecode');
+my $index = $query->param('index');
+my $resultstring = $query->param('result');
+my $dbh = C4::Context->dbh;
+
+my $startfrom=$query->param('startfrom');
+$startfrom=0 if(!defined $startfrom);
+my ($template, $loggedinuser, $cookie);
+my $resultsperpage;
+
+my $authtypes = getauthtypes;
+my @authtypesloop;
+foreach my $thisauthtype (keys %$authtypes) {
+	my $selected = 1 if $thisauthtype eq $authtypecode;
+	my %row =(value => $thisauthtype,
+				selected => $selected,
+				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+			  index => $index,
+			);
+	push @authtypesloop, \%row;
+}
+
+if ($op eq "do_search") {
+	my @marclist = $query->param('marclist');
+	
+	my @operator = $query->param('operator');
+	my @value = $query->param('value');
+
+	$resultsperpage= $query->param('resultsperpage');
+	$resultsperpage = 10 ;
+
+	my ($results,$total) = authoritysearch($dbh, \@marclist, \@operator, \@value,$startfrom*$resultsperpage, $resultsperpage,$authtypecode);# $orderby);
+
+	($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/searchresultlist-auth.tmpl",
+				query => $query,
+				type => 'intranet',
+				authnotrequired => 0,
+				flagsrequired => {borrowers => 1},
+				flagsrequired => {catalogue => 1},
+				debug => 1,
+				});
+
+	# multi page display gestion
+	my $displaynext=0;
+	my $displayprev=$startfrom;
+	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
+		$displaynext = 1;
+	}
+
+	my @field_data = ();
+
+
+	my @marclist_ini = $query->param('marclist'); # get marclist again, as the previous one has been modified by catalogsearch (mainentry replaced by field name
+	for(my $i = 0 ; $i <= $#marclist ; $i++) {
+		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
+		push @field_data, { term => "operator", val=>$operator[$i] };
+		push @field_data, { term => "value", val=>$value[$i] };
+	}
+
+	my @numbers = ();
+
+	if ($total>$resultsperpage) {
+		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
+			if ($i<16) {
+	    		my $highlight=0;
+	    		($startfrom==($i-1)) && ($highlight=1);
+	    		push @numbers, { number => $i,
+					highlight => $highlight ,
+					searchdata=> \@field_data,
+					startfrom => ($i-1)};
+			}
+    	}
+	}
+
+	my $from = $startfrom*$resultsperpage+1;
+	my $to;
+
+ 	if($total < (($startfrom+1)*$resultsperpage)) {
+		$to = $total;
+	} else {
+		$to = (($startfrom+1)*$resultsperpage);
+	}
+	$template->param(result => $results) if $results;
+	$template->param(index => $query->param('index')."");
+	$template->param(startfrom=> $startfrom,
+							displaynext=> $displaynext,
+							displayprev=> $displayprev,
+							resultsperpage => $resultsperpage,
+							startfromnext => $startfrom+1,
+							startfromprev => $startfrom-1,
+					      		  index => $index,
+							searchdata=>\@field_data,
+							total=>$total,
+							from=>$from,
+							to=>$to,
+							numbers=>\@numbers,
+							authtypecode =>$authtypecode,
+							resultstring =>$value[0],
+							);
+} else {
+	($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/auth_finder.tmpl",
+				query => $query,
+				type => 'intranet',
+				authnotrequired => 0,
+				flagsrequired => {catalogue => 1},
+				debug => 1,
+				});
+
+	$template->param(index=>$query->param('index')."",
+					resultstring => $resultstring,
+					);
+}
+
+$template->param(authtypesloop => \@authtypesloop,
+				authtypecode => $authtypecode,
+				nonav=>"1",);
+
+# Print the page
+output_html_with_http_headers $query, $cookie, $template->output;
+
+# Local Variables:
+# tab-width: 4
+# End:

Index: auth_linker.pl
===================================================================
RCS file: auth_linker.pl
diff -N auth_linker.pl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ auth_linker.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
@@ -0,0 +1,161 @@
+#!/usr/bin/perl
+# WARNING: 4-character tab stops here
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+use strict;
+
+use CGI;
+use C4::Auth;
+use C4::Context;
+use C4::Search;
+
+use C4::Interface::CGI::Output;
+use C4::AuthoritiesMarc;
+use C4::Koha; # XXX subfield_is_koha_internal_p
+
+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 $resultstring = $query->param('result');
+my $dbh = C4::Context->dbh;
+
+my $startfrom=$query->param('startfrom');
+$startfrom=0 if(!defined $startfrom);
+my ($template, $loggedinuser, $cookie);
+my $resultsperpage;
+
+my $authtypes = getauthtypes;
+my @authtypesloop;
+foreach my $thisauthtype (keys %$authtypes) {
+	my $selected = 1 if $thisauthtype eq $authtypecode;
+	my %row =(value => $thisauthtype,
+				selected => $selected,
+				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+			  index => $index,
+			);
+	push @authtypesloop, \%row;
+}
+
+if ($op eq "do_search") {
+	my @marclist = $query->param('marclist');
+	
+	my @operator = $query->param('operator');
+	my @value = $query->param('value');
+
+	$resultsperpage= $query->param('resultsperpage');
+	$resultsperpage = 10 if(!defined $resultsperpage);
+
+	my ($results,$total) = authoritysearch($dbh, \@marclist, \@operator, \@value,$startfrom*$resultsperpage, $resultsperpage,$authtypecode) ;
+
+
+	($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/linkresultlist-auth.tmpl",
+				query => $query,
+				type => 'intranet',
+				authnotrequired => 0,
+				flagsrequired => {borrowers => 1},
+				flagsrequired => {catalogue => 1},
+				debug => 1,
+				});
+
+	# multi page display gestion
+	my $displaynext=0;
+	my $displayprev=$startfrom;
+	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
+		$displaynext = 1;
+	}
+
+	my @field_data = ();
+
+
+	my @marclist_ini = $query->param('marclist'); # get marclist again, as the previous one has been modified by authoritysearch (mainentry replaced by field name
+	for(my $i = 0 ; $i <= $#marclist ; $i++) {
+		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
+		push @field_data, { term => "operator", val=>$operator[$i] };
+		push @field_data, { term => "value", val=>$value[$i] };
+	}
+
+	my @numbers = ();
+
+	if ($total>$resultsperpage) {
+		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
+			if ($i<16) {
+	    		my $highlight=0;
+	    		($startfrom==($i-1)) && ($highlight=1);
+	    		push @numbers, { number => $i,
+					highlight => $highlight ,
+					searchdata=> \@field_data,
+					startfrom => ($i-1)};
+			}
+    	}
+	}
+
+	my $from = $startfrom*$resultsperpage+1;
+	my $to;
+
+ 	if($total < (($startfrom+1)*$resultsperpage)) {
+		$to = $total;
+	} else {
+		$to = (($startfrom+1)*$resultsperpage);
+	}
+	$template->param(result => $results) if $results;
+	$template->param(index => $query->param('index')."");
+	$template->param(startfrom=> $startfrom,
+							displaynext=> $displaynext,
+							displayprev=> $displayprev,
+							resultsperpage => $resultsperpage,
+							startfromnext => $startfrom+1,
+							startfromprev => $startfrom-1,
+					        		index => $index,
+							searchdata=>\@field_data,
+							total=>$total,
+							from=>$from,
+							to=>$to,
+							numbers=>\@numbers,
+							authtypecode =>$authtypecode,
+							resultstring =>$value[0],
+							);
+} else {
+	($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/auth_linker.tmpl",
+				query => $query,
+				type => 'intranet',
+				authnotrequired => 0,
+				flagsrequired => {catalogue => 1},
+				debug => 1,
+				});
+
+	$template->param(index=>$query->param('index')."",
+					resultstring => $resultstring,
+				
+					);
+}
+
+$template->param(authtypesloop => \@authtypesloop,
+				authtypecode => $authtypecode,
+				nonav=>"1",);
+
+# Print the page
+output_html_with_http_headers $query, $cookie, $template->output;
+
+# Local Variables:
+# tab-width: 4
+# End:

Index: authorities-home.pl
===================================================================
RCS file: authorities-home.pl
diff -N authorities-home.pl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ authorities-home.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
@@ -0,0 +1,186 @@
+#!/usr/bin/perl
+# WARNING: 4-character tab stops here
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+use strict;
+use CGI;
+use C4::Auth;
+use C4::Context;
+use C4::Interface::CGI::Output;
+use C4::AuthoritiesMarc;
+use C4::Koha; # XXX subfield_is_koha_internal_p
+use C4::Biblio;
+
+
+my $query=new CGI;
+my $op = $query->param('op');
+my $authtypecode = $query->param('authtypecode');
+my $dbh = C4::Context->dbh;
+my $mergefrom=$query->param('mergefrom');
+my $mergeto=$query->param('mergeto');
+my $startfrom=$query->param('startfrom');
+my $authid=$query->param('authid');
+$startfrom=0 if(!defined $startfrom);
+my ($template, $loggedinuser, $cookie);
+my $resultsperpage;
+
+my $authtypes = getauthtypes;
+my @authtypesloop;
+foreach my $thisauthtype (sort { $authtypes->{$a} <=> $authtypes->{$b} } keys %$authtypes) {
+	my $selected = 1 if $thisauthtype eq $authtypecode;
+	my %row =(value => $thisauthtype,
+				selected => $selected, 
+				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+			);
+	push @authtypesloop, \%row;
+}
+
+
+if ($op eq "do_search") {
+	my @marclist = $query->param('marclist');
+	
+	my @operator = $query->param('operator');
+	my @value = $query->param('value');
+
+	$resultsperpage= $query->param('resultsperpage');
+	$resultsperpage = 10 unless $resultsperpage;
+	my @tags;
+	my ($results,$total) = authoritysearch($dbh, \@marclist, \@operator, \@value,$startfrom*$resultsperpage, $resultsperpage,$authtypecode) ;
+	($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/searchresultlist.tmpl",
+				query => $query,
+				type => 'intranet',
+				authnotrequired => 0,
+				authtypecode=> $authtypecode,
+				flagsrequired => {borrowers => 1},
+				flagsrequired => {catalogue => 1},
+				debug => 1,
+				});
+
+	# multi page display gestion
+	my $displaynext=0;
+	my $displayprev=$startfrom;
+	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
+		$displaynext = 1;
+	}
+
+	my @field_data = ();
+
+	# we must get parameters once again. Because if there is a mainentry, it has been replaced by something else during the search, thus the links next/previous would not work anymore 
+	my @marclist_ini = $query->param('marclist');
+	for(my $i = 0 ; $i <= $#marclist ; $i++)
+	{
+		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
+		push @field_data, { term => "operator", val=>$operator[$i] };
+		push @field_data, { term => "value", val=>$value[$i] };
+	}
+
+	my @numbers = ();
+
+	if ($total>$resultsperpage)
+	{
+		for (my $i=1; $i<$total/$resultsperpage+1; $i++)
+		{
+			if ($i<31)
+			{
+	    		my $highlight=0;
+	    		($startfrom==($i-1)) && ($highlight=1);
+	    		push @numbers, { number => $i,
+					highlight => $highlight ,
+					searchdata=> \@field_data,
+					startfrom => ($i-1)};
+			}
+    	}
+	}
+
+	my $from = $startfrom*$resultsperpage+1;
+	my $to;
+
+ 	if($total < (($startfrom+1)*$resultsperpage))
+	{
+		$to = $total;
+	} else {
+		$to = (($startfrom+1)*$resultsperpage);
+	}
+	$template->param(result => $results) if $results;
+	$template->param(
+							startfrom=> $startfrom,
+							displaynext=> $displaynext,
+							displayprev=> $displayprev,
+							resultsperpage => $resultsperpage,
+							startfromnext => $startfrom+1,
+							startfromprev => $startfrom-1,
+							searchdata=>\@field_data,
+							total=>$total,
+							from=>$from,
+							to=>$to,
+							numbers=>\@numbers,
+							authtypecode=>$authtypecode,
+							);
+
+} elsif ($op eq "delete") {
+
+	&AUTHdelauthority($dbh,$authid);
+
+	($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/authorities-home.tmpl",
+				query => $query,
+				type => 'intranet',
+				authnotrequired => 0,
+				flagsrequired => {catalogue => 1},
+				debug => 1,
+				});
+
+
+}elsif ($op eq "merge") {
+
+
+	my $MARCfrom = XMLgetauthorityhash($dbh,$mergefrom);
+	my $MARCto = XMLgetauthorityhash($dbh,$mergeto);
+	merge($dbh,$mergefrom,$MARCfrom,$mergeto,$MARCto);
+	($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/authorities-home.tmpl",
+				query => $query,
+				type => 'intranet',
+				authnotrequired => 0,
+				flagsrequired => {catalogue => 1},
+				debug => 1,
+				});
+}else {
+	($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/authorities-home.tmpl",
+				query => $query,
+				type => 'intranet',
+				authnotrequired => 0,
+				flagsrequired => {catalogue => 1},
+				debug => 1,
+				});
+
+}
+
+
+
+$template->param(authtypesloop => \@authtypesloop);
+
+# Print the page
+output_html_with_http_headers $query, $cookie, $template->output;
+
+# Local Variables:
+# tab-width: 4
+# End:

Index: authorities.pl
===================================================================
RCS file: authorities.pl
diff -N authorities.pl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ authorities.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
@@ -0,0 +1,594 @@
+#!/usr/bin/perl
+
+# $Id: authorities.pl,v 1.1.2.1 2007/03/10 01:10:53 tgarip1957 Exp $
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+use strict;
+use CGI;
+use C4::Auth;
+use C4::Output;
+use C4::Interface::CGI::Output;
+use C4::AuthoritiesMarc;
+use C4::Biblio;
+use C4::Context;
+use C4::Koha; # XXX subfield_is_koha_internal_p
+use Encode;
+
+use vars qw( $tagslib);
+use vars qw( $authorised_values_sth);
+use vars qw( $is_a_modif );
+my $input = new CGI;
+my $z3950 = $input->param('z3950');
+my $logstatus=C4::Context->preference('Activate_log');
+my $xml;
+my $itemtype; # created here because it can be used in build_authorized_values_list sub
+
+
+
+
+
+=item build_authorized_values_list
+
+=cut
+
+sub build_authorized_values_list ($$$$$) {
+	my($tag, $subfield, $value, $dbh,$authorised_values_sth) = @_;
+
+	my @authorised_values;
+	my %authorised_lib;
+
+	# builds list, depending on authorised value...
+
+	#---- branch
+	if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+	my $sth=$dbh->prepare("select branchcode,branchname from branches order by branchname");
+	$sth->execute;
+	push @authorised_values, ""
+		unless ($tagslib->{$tag}->{$subfield}->{mandatory});
+
+	while (my ($branchcode,$branchname) = $sth->fetchrow_array) {
+		push @authorised_values, $branchcode;
+		$authorised_lib{$branchcode}=$branchname;
+	}
+
+	#----- itemtypes
+	} elsif ($tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes") {
+		my $sth=$dbh->prepare("select itemtype,description from itemtypes order by description");
+		$sth->execute;
+		push @authorised_values, "" unless ($tagslib->{$tag}->{$subfield}->{mandatory});
+	
+		while (my ($itemtype,$description) = $sth->fetchrow_array) {
+			push @authorised_values, $itemtype;
+			$authorised_lib{$itemtype}=$description;
+		}
+		$value=$itemtype unless ($value);
+
+	#---- "true" authorised value
+	} else {
+		$authorised_values_sth->execute($tagslib->{$tag}->{$subfield}->{authorised_value});
+
+		push @authorised_values, "" unless ($tagslib->{$tag}->{$subfield}->{mandatory});
+	
+		while (my ($value,$lib) = $authorised_values_sth->fetchrow_array) {
+			push @authorised_values, $value;
+			$authorised_lib{$value}=$lib;
+		}
+    }
+    return CGI::scrolling_list( -name     => 'field_value',
+				-values   => \@authorised_values,
+				-default  => $value,
+				-labels   => \%authorised_lib,
+				-override => 1,
+				-size     => 1,
+				-multiple => 0 );
+}
+
+
+=item create_input
+ builds the <input ...> entry for a subfield.
+=cut
+sub create_input () {
+	my ($tag,$subfield,$value,$i,$tabloop,$rec,$authorised_values_sth,$id) = @_;	
+	my $dbh=C4::Context->dbh;
+	$value =~ s/"/&quot;/g;
+	my %subfield_data;
+	$subfield_data{id}=$id;
+	$subfield_data{tag}=$tag;
+	$subfield_data{subfield}=$subfield;
+	$subfield_data{marc_lib}="<span id=\"error$i\">".$tagslib->{$tag}->{$subfield}->{lib}."</span>";
+	$subfield_data{marc_lib_plain}=$tagslib->{$tag}->{$subfield}->{lib};
+	$subfield_data{tag_mandatory}=$tagslib->{$tag}->{mandatory};
+	$subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
+	$subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
+	$subfield_data{index} = $i;
+	$subfield_data{visibility} = "display:none" if (substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) gt "0") ; #check parity
+	# it's an authorised field
+	if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
+		$subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh,$authorised_values_sth);
+	# it's linking authority field to another authority
+	} elsif ($tagslib->{$tag}->{$subfield}->{link}) {
+		$subfield_data{marc_value}="<input onblur=\"this.style.backgroundColor='#ffffff';\" onfocus=\"this.style.backgroundColor='#ffffff;'\" tabindex=\"1\" type=\"text\" name=\"field_value\" id=\"field_value$id\" value=\"$value\" size=\"40\" maxlength=\"255\" DISABLE READONLY> <a  style=\"cursor: help;\" href=\"javascript:Dopop('../authorities/auth_linker.pl?index=$id',$id);\">...</a>";
+	
+		# it's a plugin field
+	} elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
+		# opening plugin. Just check wether we are on a developper computer on a production one
+		# (the cgidir differs)
+		my $cgidir = C4::Context->intranetdir ."/cgi-bin/value_builder";
+		unless (opendir(DIR, "$cgidir")) {
+			$cgidir = C4::Context->intranetdir."/value_builder";
+		} 
+		my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'}; 
+		require $plugin;
+		my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
+		my ($function_name,$javascript) = plugin_javascript($dbh,$rec,$tagslib,$i,$tabloop);
+		$subfield_data{marc_value}="<input tabindex=\"1\" type=\"text\"  name=\"field_value\" id=\"field_value$id\"  value=\"$value\" size=\"40\" maxlength=\"255\" DISABLE READONLY OnFocus=\"javascript:Focus$function_name($i)\" OnBlur=\"javascript:Blur$function_name($i); \"> <a  style=\"cursor: help;\" href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
+	# it's an hidden field
+	} elsif  ($tag eq '') {
+		$subfield_data{marc_value}="<input onblur=\"this.style.backgroundColor='#ffffff';\" onfocus=\"this.style.backgroundColor='#ffffff'; \" tabindex=\"1\" type=\"hidden\" name=\"field_value\" id=\"field_value$id\"  value=\"$value\">";
+	} elsif  (substr($tagslib->{$tag}->{$subfield}->{'hidden'},2,1) gt "1") {
+
+		$subfield_data{marc_value}="<input onblur=\"this.style.backgroundColor='#ffffff';\" onfocus=\"this.style.backgroundColor='#ffffff'; \" tabindex=\"1\" type=\"text\" name=\"field_value\" id=\"field_value$id\"   value=\"$value\" size=\"40\" maxlength=\"255\" >";
+	# it's a standard field
+	} else {
+		if (length($value) >100) {
+			$subfield_data{marc_value}="<textarea tabindex=\"1\" name=\"field_value\" id=\"field_value$id\"  cols=\"40\" rows=\"5\" >$value</textarea>";
+		} else {
+			$subfield_data{marc_value}="<input onblur=\"this.style.backgroundColor='#ffffff';\" onfocus=\"this.style.backgroundColor='#ffffff'; \" tabindex=\"1\" type=\"text\" name=\"field_value\" id=\"field_value$id\"  value=\"$value\" size=\"50\">"; #"
+		}
+	}
+	return \%subfield_data;
+}
+
+sub build_tabs  ($$$;$){
+    my($template, $xmlhash, $dbh,$addedfield) = @_;
+    # fill arrays
+    my @loop_data =();
+    my $tag;
+    my $i=0;
+my $id=100;
+my ($authidtagfield,$authidtagsubfield)=MARCfind_marc_from_kohafield("authid","authorities");
+	my $authorised_values_sth = $dbh->prepare("select authorised_value,lib
+		from authorised_values
+		where category=? order by lib");
+my $author;
+my $controlfields;
+my $leader;
+if ($xmlhash){
+ $author=$xmlhash->{'datafield'};
+ $controlfields=$xmlhash->{'controlfield'};
+ $leader=$xmlhash->{'leader'};
+}
+    my @BIG_LOOP;
+my %built;
+# loop through each tab 0 through 9
+	for (my $tabloop = 0; $tabloop <= 9; $tabloop++) {
+		my @loop_data = ();
+		foreach my $tag (sort(keys (%{$tagslib}))) {
+			my $indicator;
+				# if MARC::Record is not empty => use it as master loop, then add missing subfields that should be in the tab.
+				# if MARC::Record is empty => use tab as master loop.
+	if ($xmlhash) {
+			####
+		
+			my %tagdefined;
+			my %definedsubfields;
+			my $hiddenrequired;
+			my ($ind1,$ind2);
+			
+		 if ($tag>9){
+			next if ($tag eq $authidtagfield); #we do not want authid to duplicate
+
+			foreach my $data (@$author){							
+					$hiddenrequired=0;
+					my @subfields_data;
+					undef %definedsubfields;
+   	 			 if ($data->{'tag'} eq $tag){
+					$tagdefined{$tag}=1 ;
+					   if ($built{$tag}==1){
+						$hiddenrequired=1;
+					    }
+					    $ind1="  ";
+					      $ind2="  ";		
+					      foreach my $subfieldcode ( $data->{'subfield'}){
+		   				 foreach my $code ( @$subfieldcode){	
+							next if ($tagslib->{$tag}->{$code->{'code'}}->{tab} ne $tabloop);						
+							my $subfield=$code->{'code'}  ;
+							my $value=$code->{'content'};
+							$definedsubfields{$tag.$subfield}=1 ;
+							 $built{$tag}=1;
+							push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$xmlhash,$authorised_values_sth,$id)) ;
+							$i++ ;
+		   				}
+					      } ##each subfield
+					    $ind1=$data->{'ind1'};
+					    $ind2=	$data->{'ind2'};
+					  
+					if ($hiddenrequired && $#loop_data >=0 && $loop_data[$#loop_data]->{'tag'} eq $tag) {
+						my @hiddensubfields_data;
+						my %tag_data;
+						push(@hiddensubfields_data, &create_input('','','',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
+						$tag_data{tag} = '';
+						$tag_data{tag_lib} = '';
+						$tag_data{indicator} = '';
+						$tag_data{subfield_loop} = \@hiddensubfields_data;
+						push (@loop_data, \%tag_data);
+						$i++;
+					}
+					# now, loop again to add parameter subfield that are not in the MARC::Record
+					
+					foreach my $subfield (sort( keys %{$tagslib->{$tag}})) {
+						next if (length $subfield !=1);
+						next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
+						next if ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) >1)  ); #check for visibility flag
+						next if ($definedsubfields{$tag.$subfield} );
+						push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
+						$definedsubfields{$tag.$subfield}=1;
+						$i++;
+					}
+					if ($#subfields_data >= 0) {
+						my %tag_data;
+						$tag_data{tag} = $tag;
+						$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+						$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
+						$tag_data{indicator} = $ind1.$ind2 if ($tag>=10);
+						$tag_data{subfield_loop} = \@subfields_data;
+						push (@loop_data, \%tag_data);
+						
+					}
+					$id++;
+  	  			     }## if tag matches
+			
+			}#eachdata
+ 		}else{ ## tag <10
+			next if ($tag eq $authidtagfield); #we do not want authid to duplicate
+
+			        if ($tag eq "000" || $tag eq "LDR"){
+					my $subfield="@";
+					next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
+					my @subfields_data;
+					my $value=$leader->[0] if $leader->[0];
+					$tagdefined{$tag}=1 ;
+					push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$xmlhash,$authorised_values_sth,$id));					
+					$i++;
+					if ($#subfields_data >= 0) {
+						my %tag_data;
+						$tag_data{tag} = $tag;
+						$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+						$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
+						$tag_data{subfield_loop} = \@subfields_data;
+                                                			$tag_data{fixedfield} = 1;
+						push (@loop_data, \%tag_data);
+					}
+			         }else{
+	   			 foreach my $control (@$controlfields){
+					my $subfield="@";
+					next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
+					next if ($tagslib->{$tag} eq $authidtagfield);
+					my @subfields_data;
+					if ($control->{'tag'} eq $tag){
+						$hiddenrequired=0;
+						$tagdefined{$tag}=1;
+						 if ($built{$tag}==1){$hiddenrequired=1;}
+						my $value=$control->{'content'} ;
+						$definedsubfields{$tag.'@'}=1;
+						push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$xmlhash,$authorised_values_sth,$id));					
+						$i++;
+					
+					   	$built{$tag}=1;
+					###hiddenrequired
+					if ($#subfields_data >= 0) {
+						my %tag_data;
+						$tag_data{tag} = $tag;
+						$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+						$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
+						$tag_data{subfield_loop} = \@subfields_data;
+						$tag_data{fixedfield} = 1;
+						push (@loop_data, \%tag_data);
+					}
+					$id++;
+					}## tag matches
+	  			 }# each control
+			       }
+   			}##tag >9
+
+
+			##### Any remaining tag
+				my @subfields_data;
+				# now, loop again to add parameter subfield that are not in the MARC::Record
+					foreach my $subfield (sort( keys %{$tagslib->{$tag}})) {
+						next if ($tagdefined{$tag} );
+						next if (length $subfield !=1);
+						next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
+						next if ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) > 1) ); #check for visibility flag
+						push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
+						$tagdefined{$tag.$subfield}=1;
+						$i++;
+					}
+					if ($#subfields_data >= 0) {
+						my %tag_data;
+						$tag_data{tag} = $tag;
+						$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+						$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
+						$tag_data{indicator} = $ind1.$ind2 if ($tag>=10);
+						$tag_data{subfield_loop} = \@subfields_data;
+						if ($tag<10) {
+                                                			$tag_data{fixedfield} = 1;
+                                        				}
+
+						push (@loop_data, \%tag_data);
+					}
+
+					
+					if ($addedfield eq $tag) {
+						my %tag_data;
+						my @subfields_data;
+						$id++;
+						$tagdefined{$tag}=1 ;
+						foreach my $subfield (sort( keys %{$tagslib->{$tag}})) {
+						next if (length $subfield !=1);
+						next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
+						next if ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) >1)  ); #check for visibility flag
+						$addedfield="";	
+						push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
+						$i++;
+							}
+						if ($#subfields_data >= 0) {
+						$tag_data{tag} = $tag;
+						$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+						$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
+						$tag_data{indicator} = ' ' if ($tag>=10);
+						$tag_data{subfield_loop} = \@subfields_data;
+							if ($tag<10) {
+                                                				$tag_data{fixedfield} = 1;
+                                        					}
+						push (@loop_data, \%tag_data);
+											
+						}
+				
+					}
+				
+	# if breeding is empty
+			} else {
+				my @subfields_data;
+				foreach my $subfield (sort(keys %{$tagslib->{$tag}})) {
+					next if (length $subfield !=1);
+					next if ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) >1)  ); #check for visibility flag
+					next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
+					push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
+					$i++;
+				}
+				if ($#subfields_data >= 0) {
+					my %tag_data;
+					$tag_data{tag} = $tag;
+					$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+					$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
+					$tag_data{indicator} = $indicator;
+					$tag_data{subfield_loop} = \@subfields_data;
+					$tag_data{tagfirstsubfield} = $tag_data{subfield_loop}[0];
+					if ($tag<10) {
+						$tag_data{fixedfield} = 1;
+					}
+					push (@loop_data, \%tag_data);
+				}
+			}
+		$id++;
+	}
+	if ($#loop_data >=0) {
+            my %big_loop_line;
+            $big_loop_line{number}=$tabloop;
+            $big_loop_line{innerloop}=\@loop_data;
+            push @BIG_LOOP,\%big_loop_line;
+            }	
+#		$template->param($tabloop."XX" =>\@loop_data);
+		$template->param(BIG_LOOP => \@BIG_LOOP);
+}## tab loop
+}
+
+
+sub build_hidden_data () {
+    # build hidden data =>
+    # we store everything, even if we show only requested subfields.
+
+    my @loop_data =();
+    my $i=0;
+    foreach my $tag (keys %{$tagslib}) {
+	my $previous_tag = '';
+
+	# loop through each subfield
+	foreach my $subfield (keys %{$tagslib->{$tag}}) {
+	    next if ($subfield eq 'lib');
+	    next if ($subfield eq 'tab');
+	    next if ($subfield eq 'mandatory');
+		next if ($subfield eq 'repeatable');
+	    next if ($tagslib->{$tag}->{$subfield}->{'tab'}  ne "-1");
+	    my %subfield_data;
+	    $subfield_data{marc_lib}=$tagslib->{$tag}->{$subfield}->{lib};
+	    $subfield_data{marc_mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
+	    $subfield_data{marc_repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
+	    $subfield_data{marc_value}="<input type=\"hidden\"  name=\"field_value[]\">";
+	    push(@loop_data, \%subfield_data);
+	    $i++
+	}
+    }
+}
+
+# ======================== 
+#          MAIN 
+#=========================
+my $input = new CGI;
+my $error = $input->param('error');
+my $authid=$input->param('authid'); # if authid exists, it's a modif, not a new authority.
+my $z3950 = $input->param('z3950');
+my $op = $input->param('op');
+my $nonav = $input->param('nonav');
+my $myindex = $input->param('index');
+my $linkid=$input->param('linkid');
+my $authtypecode = $input->param('authtypecode');
+
+my $dbh = C4::Context->dbh;
+$authtypecode = &AUTHfind_authtypecode($dbh,$authid) if !$authtypecode;
+
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "authorities/authorities.tmpl",
+			     query => $input,
+			     type => "intranet",
+			     authnotrequired => 0,
+			     flagsrequired => {editcatalogue => 1},
+			     debug => 1,
+			     });
+$template->param(nonav   => $nonav,index=>$myindex,authtypecode=>$authtypecode,);
+$tagslib = AUTHgettagslib($dbh,1,$authtypecode);
+
+my $xmlhash;
+my $xml;
+$xmlhash = XMLgetauthorityhash($dbh,$authid) if ($authid);
+
+
+my ($oldauthnumtagfield,$oldauthnumtagsubfield);
+my ($oldauthtypetagfield,$oldauthtypetagsubfield);
+$is_a_modif=0;
+if ($authid) {
+	$is_a_modif=1;
+	($oldauthnumtagfield,$oldauthnumtagsubfield) = MARCfind_marc_from_kohafield("authid","authorities");
+	($oldauthtypetagfield,$oldauthtypetagsubfield) = MARCfind_marc_from_kohafield("authtypecode","authorities");
+}
+
+#------------------------------------------------------------------------------------------------------------------------------
+if ($op eq "add") {
+#------------------------------------------------------------------------------------------------------------------------------
+
+	# rebuild
+	my @tags = $input->param('tag');
+	my @subfields = $input->param('subfield');
+	my @values = $input->param('field_value');
+	# build indicator hash.
+	my @ind_tag = $input->param('ind_tag');
+	my @indicator = $input->param('indicator');
+## check for malformed xml -- non UTF-8 like (MARC8) will break xml without warning
+### This usually happens with data coming from other Z3950 servers
+## Slows the saving process so comment out at your own risk
+eval{
+ $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);	
+};
+
+ if ($@){
+warn $@;
+ $template->param(error             =>1,xmlerror=>1,);
+goto FINAL;
+  };	# check for a duplicate
+###Authorities need the XML header unlike biblios
+$xml='<?xml version="1.0" encoding="UTF-8"?>'.$xml;
+  my $xmlhash=XML_xml2hash_onerecord($xml);
+	my ($duplicateauthid,$duplicateauthvalue) = C4::AuthoritiesMarc::FindDuplicateauth($xmlhash,$authtypecode) if ($op eq "add") && (!$is_a_modif);
+#warn "duplicate:$duplicateauthid,$duplicateauthvalue";	
+	my $confirm_not_duplicate = $input->param('confirm_not_duplicate');
+	# it is not a duplicate (determined either by Koha itself or by user checking it's not a duplicate)
+	if (!$duplicateauthid or $confirm_not_duplicate) {
+# warn "noduplicate";
+		if ($is_a_modif ) {	
+			$authid=AUTHmodauthority($dbh,$authid,$xmlhash,$authtypecode);
+		} else {
+		$authid = AUTHaddauthority($dbh,$xmlhash,'',$authtypecode);
+
+		}
+	# now, redirect to detail page
+		if ($nonav){
+#warn ($myindex,$nonav);
+		print $input->redirect("auth_finder.pl?index=$myindex&nonav=$nonav&authtypecode=$authtypecode");
+		}else{
+		print $input->redirect("detail.pl?nonav=$nonav&authid=$authid");
+		}
+		exit;
+	} else {
+FINAL:
+#warn "duplicate";
+	# it may be a duplicate, warn the user and do nothing
+		build_tabs ($template, $xmlhash, $dbh);
+		build_hidden_data;
+		$template->param(authid =>$authid,
+			duplicateauthid				=> $duplicateauthid,
+			duplicateauthvalue				=> $duplicateauthvalue,
+			 );
+	}
+#------------------------------------------------------------------------------------------------------------------------------
+} elsif ($op eq "addfield") {
+#------------------------------------------------------------------------------------------------------------------------------
+	my $addedfield = $input->param('addfield_field');
+	my @tags = $input->param('tag');
+	my @subfields = $input->param('subfield');
+	my @values = $input->param('field_value');
+	# build indicator hash.
+	my @ind_tag = $input->param('ind_tag');
+	my @indicator = $input->param('indicator');
+	my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
+	$xml='<?xml version="1.0" encoding="UTF-8"?>'.$xml;
+	my $xmlhash=XML_xml2hash_onerecord($xml);
+	# adding an empty field
+	build_tabs ($template, $xmlhash, $dbh,$addedfield);
+	build_hidden_data;
+	$template->param(
+		authid                       => $authid,);
+
+} elsif ($op eq "delete") {
+#------------------------------------------------------------------------------------------------------------------------------
+	&AUTHdelauthority($dbh,$authid);
+	if ($nonav){
+	print $input->redirect("auth_finder.pl");
+	}else{
+	print $input->redirect("authorities-home.pl?authid=0");
+	}
+		exit;
+} else {
+if ($op eq "duplicate")
+	{
+		$authid = "";
+	}
+	build_tabs ($template, $xmlhash, $dbh);
+	build_hidden_data;
+	$template->param(oldauthtypetagfield=>$oldauthtypetagfield, oldauthtypetagsubfield=>$oldauthtypetagsubfield,
+		oldauthnumtagfield=>$oldauthnumtagfield, oldauthnumtagsubfield=>$oldauthnumtagsubfield,
+		authid                      => $authid , authtypecode=>$authtypecode,	);
+}
+
+$template->param(
+	authid                       => $authid,
+	authtypecode => $authtypecode,
+	linkid=>$linkid,
+			intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+		IntranetNav => C4::Context->preference("IntranetNav"),
+		advancedMARCEditor => C4::Context->preference("advancedMARCEditor"),
+		);
+
+my $authtypes = getauthtypes;
+my @authtypesloop;
+foreach my $thisauthtype (keys %$authtypes) {
+	my $selected = 1 if $thisauthtype eq $authtypecode;
+	my %row =(value => $thisauthtype,
+				selected => $selected,
+				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+			);
+	push @authtypesloop, \%row;
+}
+
+$template->param(authtypesloop => \@authtypesloop,
+				authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
+				nonav=>$nonav,);
+output_html_with_http_headers $input, $cookie, $template->output;

Index: blinddetail-biblio-search.pl
===================================================================
RCS file: blinddetail-biblio-search.pl
diff -N blinddetail-biblio-search.pl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ blinddetail-biblio-search.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
@@ -0,0 +1,125 @@
+#!/usr/bin/perl
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+=head1 NAME
+
+
+=head1 SYNOPSIS
+
+
+=head1 DESCRIPTION
+
+This script needs an authid
+
+
+
+=head1 FUNCTIONS
+
+=over 2
+
+=cut
+
+
+use strict;
+use C4::AuthoritiesMarc;
+use C4::Auth;
+use C4::Context;
+use C4::Interface::CGI::Output;
+use CGI;
+use C4::Search;
+use C4::Koha;
+use C4::Biblio;
+my $query=new CGI;
+
+my $dbh=C4::Context->dbh;
+
+my $authid = $query->param('authid');
+my $index=$query->param('index');
+my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
+my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
+my ($dummyfield,$linkidsubfield)=MARCfind_marc_from_kohafield("auth_biblio_link_subf","biblios");
+my $auth_type = AUTHgetauth_type($authtypecode);
+#warn "$authid =$authtypecode ".$auth_type->{auth_tag_to_report};
+
+my $record =XMLgetauthorityhash($dbh,$authid) if $authid;
+# open template
+my ($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/blinddetail-biblio-search.tmpl",
+			     query => $query,
+			     type => "intranet",
+			     authnotrequired => 0,
+			     flagsrequired => {catalogue => 1},
+			     debug => 1,
+			     });
+
+# fill arrays
+my @loop_data =();
+my $tag;
+my @loop_data =();
+if ($authid) {
+	my @record_subs=XML_readline_withtags($record,"","",$auth_type->{auth_tag_to_report});
+	##Put the result in a hash
+	my %filled_subfield;
+	foreach my $subfield (@record_subs) {
+	$filled_subfield{$subfield->[0]}=$subfield->[1];
+	}
+			my @subfields_data;
+			
+		# loop through each subfield
+		foreach my $subfield ('a'..'z') {			
+			my %subfield_data;
+			$subfield_data{marc_value}=$filled_subfield{$subfield} ;
+			$subfield_data{marc_subfield}=$subfield;
+			$subfield_data{marc_tag}=$auth_type->{auth_tag_to_report};
+			push(@subfields_data, \%subfield_data);
+		}
+		if ($#subfields_data>=0) {
+			my %tag_data;
+			$tag_data{tag}=$auth_type->{auth_tag_to_report}.' -'. $tagslib->{$auth_type->{auth_tag_to_report}}->{lib};
+			$tag_data{subfield} = \@subfields_data;
+			push (@loop_data, \%tag_data);
+		}
+	
+} else {
+# authid is empty => the user want to empty the entry.
+	my @subfields_data;
+	foreach my $subfield ('a'..'z') {
+			my %subfield_data;
+			$subfield_data{marc_value}='';
+			$subfield_data{marc_subfield}=$subfield;
+			push(@subfields_data, \%subfield_data);
+		}
+	foreach my $subfield ('0'..'9') {
+			my %subfield_data;
+			$subfield_data{marc_value}='';
+			$subfield_data{marc_subfield}=$subfield;
+			push(@subfields_data, \%subfield_data);
+		}
+		my %tag_data;
+		$tag_data{subfield} = \@subfields_data;
+		push (@loop_data, \%tag_data);
+}
+
+$template->param("0XX" =>\@loop_data);
+
+
+
+$template->param(authid => $authid?$authid:"", linkidsubfield=>$linkidsubfield,index=>$index,);
+output_html_with_http_headers $query, $cookie, $template->output;
+

Index: blinddetail-linker.pl
===================================================================
RCS file: blinddetail-linker.pl
diff -N blinddetail-linker.pl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ blinddetail-linker.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
@@ -0,0 +1,125 @@
+#!/usr/bin/perl
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+=head1 NAME
+
+etail.pl : script to show an authority in MARC format
+
+=head1 SYNOPSIS
+
+
+=head1 DESCRIPTION
+
+This script needs an authid
+
+
+=head1 FUNCTIONS
+
+=over 2
+
+=cut
+
+
+use strict;
+use C4::AuthoritiesMarc;
+use C4::Auth;
+use C4::Context;
+use C4::Interface::CGI::Output;
+use CGI;
+use C4::Search;
+use C4::Koha;
+use C4::Biblio;
+my $query=new CGI;
+
+my $dbh=C4::Context->dbh;
+
+my $authid = $query->param('authid');
+my $index = $query->param('index');
+my $authtypecode=$query->param('authtypecode');
+ $authtypecode = &AUTHfind_authtypecode($dbh,$authid) if !$authtypecode;
+my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
+my ($linkidfield,$linkidsubfield)=MARCfind_marc_from_kohafield("linkid","authorities");
+my $auth_type = AUTHgetauth_type($authtypecode);
+
+my $record =XMLgetauthorityhash($dbh,$authid);
+# open template
+my ($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/blinddetail-linker.tmpl",
+			     query => $query,
+			     type => "intranet",
+			     authnotrequired => 0,
+			     flagsrequired => {catalogue => 1},
+			     debug => 1,
+			     });
+
+# fill arrays
+my @loop_data =();
+my $tag;
+my @loop_data =();
+if ($authid) {
+
+#	foreach my $field ($record->field($auth_type->{auth_tag_to_report})) {
+#			my @subfields_data;
+#			my @subf=$field->subfields;
+#		# loop through each subfield
+#		for my $i (0..$#subf) {
+#			$subf[$i][0] = "@" unless $subf[$i][0];
+#			my %subfield_data;
+#			$subfield_data{marc_value}=$subf[$i][1];
+#			$subfield_data{marc_subfield}=$subf[$i][0];
+#			$subfield_data{marc_tag}=$field->tag();
+#			push(@subfields_data, \%subfield_data);
+#		}
+#		if ($#subfields_data>=0) {
+#			my %tag_data;
+#			$tag_data{tag}=$field->tag().' -'. $tagslib->{$field->tag()}->{lib};
+#			$tag_data{subfield} = \@subfields_data;
+#			push (@loop_data, \%tag_data);
+#		}
+#	}
+} else {
+# authid is empty => the user want to empty the entry.
+	my @subfields_data;
+	foreach my $subfield ('0'..'9') {
+			my %subfield_data;
+			$subfield_data{marc_value}='';
+			$subfield_data{marc_subfield}=$subfield;
+			push(@subfields_data, \%subfield_data);
+		}
+	foreach my $subfield ('a'..'z') {
+			my %subfield_data;
+			$subfield_data{marc_value}='';
+			$subfield_data{marc_subfield}=$subfield;
+			push(@subfields_data, \%subfield_data);
+		}
+	
+	if ($#subfields_data>=0) {
+		my %tag_data;
+		$tag_data{subfield} = \@subfields_data;
+		push (@loop_data, \%tag_data);
+	}
+}
+
+$template->param("0XX" =>\@loop_data);
+
+
+
+$template->param(authid => $authid?$authid:"",linkidsubfield=>$linkidsubfield, linkidfield=>$linkidfield,index => $index);
+output_html_with_http_headers $query, $cookie, $template->output;
+

Index: detail-biblio-search.pl
===================================================================
RCS file: detail-biblio-search.pl
diff -N detail-biblio-search.pl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ detail-biblio-search.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
@@ -0,0 +1,201 @@
+#!/usr/bin/perl
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+=head1 NAME
+
+etail.pl : script to show an authority in MARC format
+
+=head1 SYNOPSIS
+
+
+=head1 DESCRIPTION
+
+This script needs an authid
+
+It shows the authority in a (nice) MARC format depending on authority MARC
+parameters tables.
+
+=head1 FUNCTIONS
+
+=over 2
+
+=cut
+
+
+use strict;
+use C4::AuthoritiesMarc;
+use C4::Auth;
+use C4::Context;
+use C4::Interface::CGI::Output;
+use CGI;
+use C4::Search;
+use C4::Koha;
+
+my $query=new CGI;
+
+my $dbh=C4::Context->dbh;
+
+my $authid = $query->param('authid');
+my $index = $query->param('index');
+my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
+my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
+
+my $record =XMLgetauthorityhash($dbh,$authid);
+# open template
+my ($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/detail-biblio-search.tmpl",
+			     query => $query,
+			     type => "intranet",
+			     authnotrequired => 0,
+			     flagsrequired => {catalogue => 1},
+			     debug => 1,
+			     });
+
+# fill arrays
+my @loop_data =();
+my $tag;
+if ($xmlhash){
+# loop through each tab 0 through 9
+my $author=$xmlhash->{'datafield'};
+my $controlfields=$xmlhash->{'controlfield'};
+my $leader=$xmlhash->{'leader'};
+for (my $tabloop = 0; $tabloop<10;$tabloop++) {
+# loop through each tag
+	my @loop_data =();
+	my @subfields_data;
+
+	# deal with leader 
+	unless (($tagslib->{'000'}->{'@'}->{tab}  ne $tabloop)  || (substr($tagslib->{'000'}->{'@'}->{hidden},1,1)>0)) {
+		
+		my %subfield_data;
+		$subfield_data{marc_value}=$leader->[0] ;
+		push(@subfields_data, \%subfield_data);
+		my %tag_data;
+		$tag_data{tag}='000 -'. $tagslib->{'000'}->{lib};
+		my @tmp = @subfields_data;
+		$tag_data{subfield} = \@tmp;
+		push (@loop_data, \%tag_data);
+		undef @subfields_data;
+	}
+	##Controlfields
+		
+		 foreach my $control (@$controlfields){
+			my %subfield_data;
+			my %tag_data;
+			next if ($tagslib->{$control->{'tag'}}->{'@'}->{tab}  ne $tabloop);
+			next if (substr($tagslib->{$control->{'tag'}}->{'@'}->{hidden},1,1)>0);			
+			$subfield_data{marc_value}=$control->{'content'} ;
+			push(@subfields_data, \%subfield_data);
+				if (C4::Context->preference('hide_marc')) {
+					$tag_data{tag}=$tagslib->{$control->{'tag'}}->{lib};
+				} else {
+					$tag_data{tag}=$control->{'tag'}.' -'. $tagslib->{$control->{'tag'}}->{lib};
+				}			
+			my @tmp = @subfields_data;
+			$tag_data{subfield} = \@tmp;
+			push (@loop_data, \%tag_data);
+			undef @subfields_data;
+		}
+	my $previoustag;
+	my %datatags;
+	my $i=0;
+	foreach my $data (@$author){
+		$datatags{$i++}=$data->{'tag'};
+		 foreach my $subfield ( $data->{'subfield'}){
+		     foreach my $code ( @$subfield){
+			next if ($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{tab}  ne $tabloop);
+			next if (substr($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{hidden},1,1)>0);
+			my %subfield_data;
+			my $value=$code->{'content'};
+			$subfield_data{marc_lib}=$tagslib->{$data->{'tag'}}->{$code->{'code'}}->{lib};
+			$subfield_data{link}=$tagslib->{$data->{'tag'}}->{$code->{'code'}}->{link};
+			if ($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{isurl}) {
+				$subfield_data{marc_value}="<a href=\"$value]\">$value</a>";
+			} else {
+			$subfield_data{marc_value}=get_authorised_value_desc($data->{'tag'}, $code->{'code'}, $value, '', $dbh);
+			}
+			$subfield_data{marc_subfield}=$code->{'code'};
+			$subfield_data{marc_tag}=$data->{'tag'};
+			push(@subfields_data, \%subfield_data);
+		     }### $code
+		
+		
+		if ($#subfields_data>=0) {
+			my %tag_data;
+			if (($datatags{$i} eq $datatags{$i-1}) && (C4::Context->preference('LabelMARCView') eq 'economical')) {
+				$tag_data{tag}="";
+			} else {
+				if (C4::Context->preference('hide_marc')) {
+					$tag_data{tag}=$tagslib->{$data->{'tag'}}->{lib};
+				} else {
+					$tag_data{tag}=$data->{'tag'}.' -'. $tagslib->{$data->{'tag'}}->{lib};
+				}
+			}
+			my @tmp = @subfields_data;
+			$tag_data{subfield} = \@tmp;
+			push (@loop_data, \%tag_data);
+			undef @subfields_data;
+		}
+	      }### each $subfield
+	}
+
+	$template->param($tabloop."XX" =>\@loop_data);
+}
+
+my $authtypes = getauthtypes;
+my @authtypesloop;
+foreach my $thisauthtype (keys %$authtypes) {
+	my $selected = 1 if $thisauthtype eq $authtypecode;
+	my %row =(value => $thisauthtype,
+				selected => $selected,
+				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+			);
+	push @authtypesloop, \%row;
+}
+
+$template->param(authid => $authid,
+				authtypesloop => \@authtypesloop, index => $index);
+}
+output_html_with_http_headers $query, $cookie, $template->output;
+
+sub get_authorised_value_desc ($$$$$) {
+   my($tag, $subfield, $value, $framework, $dbh) = @_;
+
+   #---- branch
+    if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+       return getbranchname($value);
+    }
+
+   #---- itemtypes
+   if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+       return ItemType($value);
+    }
+
+   #---- "true" authorized value
+   my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
+
+   if ($category ne "") {
+       my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
+       $sth->execute($category, $value);
+       my $data = $sth->fetchrow_hashref;
+       return $data->{'lib'};
+   } else {
+       return $value; # if nothing is found return the original value
+   }
+}

Index: detail.pl
===================================================================
RCS file: detail.pl
diff -N detail.pl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ detail.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
@@ -0,0 +1,210 @@
+#!/usr/bin/perl
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+=head1 NAME
+
+etail.pl : script to show an authority in MARC format
+
+=head1 SYNOPSIS
+
+
+=head1 DESCRIPTION
+
+This script needs an authid
+
+It shows the authority in a (nice) MARC format depending on authority MARC
+parameters tables.
+
+=head1 FUNCTIONS
+
+=over 2
+
+=cut
+
+
+use strict;
+use C4::AuthoritiesMarc;
+use C4::Auth;
+use C4::Context;
+use C4::Interface::CGI::Output;
+use CGI;
+use C4::Search;
+use C4::Koha;
+
+
+my $query=new CGI;
+
+my $dbh=C4::Context->dbh;
+my $nonav = $query->param('nonav');
+my $authid = $query->param('authid');
+my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
+my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
+
+my $xmlhash =XMLgetauthorityhash($dbh,$authid);
+
+my ($count) = AUTHcount_usage($authid);
+
+#chop;
+
+# open template
+my ($template, $loggedinuser, $cookie)
+		= get_template_and_user({template_name => "authorities/detail.tmpl",
+			     query => $query,
+			     type => "intranet",
+			     authnotrequired => 0,
+			     flagsrequired => {catalogue => 1},
+			     debug => 1,
+			     });
+
+
+# fill arrays
+my @loop_data =();
+my $tag;
+if ($xmlhash){
+# loop through each tab 0 through 9
+my $author=$xmlhash->{'datafield'};
+my $controlfields=$xmlhash->{'controlfield'};
+my $leader=$xmlhash->{'leader'};
+for (my $tabloop = 0; $tabloop<10;$tabloop++) {
+# loop through each tag
+	my @loop_data =();
+	my @subfields_data;
+
+	# deal with leader 
+	unless (($tagslib->{'000'}->{'@'}->{tab}  ne $tabloop)  || (substr($tagslib->{'000'}->{'@'}->{hidden},1,1)>0)) {
+		
+		my %subfield_data;
+		$subfield_data{marc_value}=$leader->[0] ;
+		push(@subfields_data, \%subfield_data);
+		my %tag_data;
+		$tag_data{tag}='000 -'. $tagslib->{'000'}->{lib};
+		my @tmp = @subfields_data;
+		$tag_data{subfield} = \@tmp;
+		push (@loop_data, \%tag_data);
+		undef @subfields_data;
+	}
+	##Controlfields
+		
+		 foreach my $control (@$controlfields){
+			my %subfield_data;
+			my %tag_data;
+			next if ($tagslib->{$control->{'tag'}}->{'@'}->{tab}  ne $tabloop);
+			next if (substr($tagslib->{$control->{'tag'}}->{'@'}->{hidden},1,1)>0);			
+			$subfield_data{marc_value}=$control->{'content'} ;
+			push(@subfields_data, \%subfield_data);
+				if (C4::Context->preference('hide_marc')) {
+					$tag_data{tag}=$tagslib->{$control->{'tag'}}->{lib};
+				} else {
+					$tag_data{tag}=$control->{'tag'}.' -'. $tagslib->{$control->{'tag'}}->{lib};
+				}			
+			my @tmp = @subfields_data;
+			$tag_data{subfield} = \@tmp;
+			push (@loop_data, \%tag_data);
+			undef @subfields_data;
+		}
+	my $previoustag;
+	my %datatags;
+	my $i=0;
+	foreach my $data (@$author){
+		$datatags{$i++}=$data->{'tag'};
+		 foreach my $subfield ( $data->{'subfield'}){
+		     foreach my $code ( @$subfield){
+			next if ($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{tab}  ne $tabloop);
+			next if (substr($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{hidden},1,1)>0);
+			my %subfield_data;
+			my $value=$code->{'content'};
+			$subfield_data{marc_lib}=$tagslib->{$data->{'tag'}}->{$code->{'code'}}->{lib};
+			$subfield_data{link}=$tagslib->{$data->{'tag'}}->{$code->{'code'}}->{link};
+			if ($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{isurl}) {
+				$subfield_data{marc_value}="<a href=\"$value]\">$value</a>";
+			} else {
+			$subfield_data{marc_value}=get_authorised_value_desc($data->{'tag'}, $code->{'code'}, $value, '', $dbh);
+			}
+			$subfield_data{marc_subfield}=$code->{'code'};
+			$subfield_data{marc_tag}=$data->{'tag'};
+			push(@subfields_data, \%subfield_data);
+		     }### $code
+		
+		
+		if ($#subfields_data>=0) {
+			my %tag_data;
+			if (($datatags{$i} eq $datatags{$i-1}) && (C4::Context->preference('LabelMARCView') eq 'economical')) {
+				$tag_data{tag}="";
+			} else {
+				if (C4::Context->preference('hide_marc')) {
+					$tag_data{tag}=$tagslib->{$data->{'tag'}}->{lib};
+				} else {
+					$tag_data{tag}=$data->{'tag'}.' -'. $tagslib->{$data->{'tag'}}->{lib};
+				}
+			}
+			my @tmp = @subfields_data;
+			$tag_data{subfield} = \@tmp;
+			push (@loop_data, \%tag_data);
+			undef @subfields_data;
+		}
+	      }### each $subfield
+	}
+
+	$template->param($tabloop."XX" =>\@loop_data);
+}
+my $authtypes = getauthtypes;
+my @authtypesloop;
+foreach my $thisauthtype (keys %$authtypes) {
+	my $selected = 1 if $thisauthtype eq $authtypecode;
+	my %row =(value => $thisauthtype,
+				selected => $selected,
+				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+			);
+	push @authtypesloop, \%row;
+}
+
+$template->param(authid => $authid,
+				count => $count,
+				authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
+				authtypecode => $authtypes->{$authtypecode}{'authtypecode'},
+				authtypesloop => \@authtypesloop);
+$template->param(nonav =>$nonav);
+}### if $xmlash exist
+output_html_with_http_headers $query, $cookie, $template->output;
+
+sub get_authorised_value_desc ($$$$$) {
+   my($tag, $subfield, $value, $framework, $dbh) = @_;
+
+   #---- branch
+    if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+       return getbranchname($value);
+    }
+
+   #---- itemtypes
+   if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+       return ItemType($value);
+    }
+
+   #---- "true" authorized value
+   my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
+
+   if ($category ne "") {
+       my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
+       $sth->execute($category, $value);
+       my $data = $sth->fetchrow_hashref;
+       return $data->{'lib'};
+   } else {
+       return $value; # if nothing is found return the original value
+   }
+}
\ No newline at end of file

Index: merge_authority.pl
===================================================================
RCS file: merge_authority.pl
diff -N merge_authority.pl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ merge_authority.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
@@ -0,0 +1,83 @@
+#!/usr/bin/perl
+
+
+use strict;
+
+# Koha modules used
+use C4::Context;
+use C4::Biblio;
+use C4::AuthoritiesMarc; ###merge routine moved to there
+use Time::HiRes qw(gettimeofday);
+
+use Getopt::Long;
+my ($version, $verbose, $mergefrom,$mergeto,$noconfirm,$batch);
+GetOptions(
+    'h' => \$version,
+    'f:s' => \$mergefrom,
+    't:s' => \$mergeto,
+    'v' => \$verbose,
+	'n' => \$noconfirm,
+	'b' => \$batch,
+);
+
+if ($version || ($mergefrom eq '' && !$batch)) {
+	print <<EOF
+Script to merge an authority into another
+parameters :
+\th : this version/help screen
+\tv : verbose mode (show many things on screen)
+\tf : the authority number to merge (the one that can be deleted after the merge).
+\tt : the authority number where to merge
+\tb : batch merging.
+\tn : don't ask for confirmation (useful for batch mergings, should not be used on command line)
+
+All biblios with the authority in -t will be modified to be "connected" to authority -f
+SAMPLE :
+./merge_authority.pl -f 2457 -t 531
+
+Before doing anything, the script will show both authorities and ask for confirmation. Of course, you can merge only 2 authorities of the same kind.
+
+BATCH MODE :
+The batch mode is done to report modifs. On every authority modif, a file is generated in KOHAROOT/localfile/modified_authorities/ If this script is called with -b, it parses the directory, finding & updating biblios using the modified authority.
+
+./merge_authority.pl -b
+
+(don't forget to export PERL5LIB and KOHA_CONF. Here is my cron job :
+SHELL=/bin/bash
+*/5 * * * *       export PERL5LIB=/home/httpd/koha;export KOHA_CONF=/etc/mykoha.conf;/home/httpd/koha/scripts/misc/merge_authority.pl -b -n
+
+EOF
+;#
+exit;
+}#
+
+my $dbh = C4::Context->dbh;
+# my @subf = $subfields =~ /(##\d\d\d##.)/g;
+
+$|=1; # flushes output
+my $starttime = gettimeofday;
+if ($batch) {
+	my @authlist;
+	my $cgidir = C4::Context->intranetdir ."/cgi-bin";
+	unless (opendir(DIR, "$cgidir/localfile/modified_authorities")) {
+		$cgidir = C4::Context->intranetdir;
+		opendir(DIR, "$cgidir/localfile/modified_authorities") || die "can't opendir $cgidir/localfile/modified_authorities: $!";
+	} 
+	while (my $authid = readdir(DIR)) {
+		if ($authid =~ /\.authid$/) {
+			$authid =~ s/\.authid$//;
+			print "managing $authid\n" if $verbose;
+			my $MARCauth = XMLgetauthorityhash($dbh,$authid);
+			&merge($dbh,$authid,$MARCauth,$authid,$MARCauth) if ($MARCauth);
+			unlink $cgidir.'/localfile/modified_authorities/'.$authid.'.authid';
+		}
+	}
+	closedir DIR;
+} else {
+	my $MARCfrom = XMLgetauthorityhash($dbh,$mergefrom);
+	my $MARCto = XMLgetauthorityhash($dbh,$mergeto);
+	&merge($dbh,$mergefrom,$MARCfrom,$mergeto,$MARCto);
+}
+my $timeneeded = gettimeofday - $starttime;
+print "Done in $timeneeded seconds" unless $noconfirm;
+





More information about the Koha-cvs mailing list