[Koha-cvs] CVS: koha/authorities authorities.pl,1.10,1.11

[Paul POULAIN]

Update of /cvsroot/koha/koha/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17460/authorities

Modified Files:
	authorities.pl 
Log Message:
synch'ing 2.2 and head

Index: authorities.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** authorities.pl	5 Apr 2005 15:23:41 -0000	1.10
--- authorities.pl	4 May 2005 08:51:07 -0000	1.11
***************
*** 161,165 ****
  sub build_tabs ($$$$) {
      my($template, $record, $dbh,$encoding) = @_;
- #	warn "=>".$record->as_formatted if $record;
      # fill arrays
      my @loop_data =();
--- 161,164 ----
***************
*** 336,344 ****
  # MARC::Record built => now, record in DB
  	# check for a duplicate
! 	my ($duplicateauthnumber,$duplicateauthid,$duplicateauthvalue) = FindDuplicate($record,$authtypecode) if ($op eq "add") && (!$is_a_modif);
  	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 (!$duplicateauthnumber or $confirm_not_duplicate) {
! 		# MARC::Record built => now, record in DB
  		if ($is_a_modif) {
  			AUTHmodauthority($dbh,$authid,$record,$authtypecode);
--- 335,342 ----
  # MARC::Record built => now, record in DB
  	# check for a duplicate
! 	my ($duplicateauthid,$duplicateauthvalue) = FindDuplicate($record,$authtypecode) if ($op eq "add") && (!$is_a_modif);
  	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) {
  		if ($is_a_modif) {
  			AUTHmodauthority($dbh,$authid,$record,$authtypecode);
***************
*** 346,364 ****
  			($authid) = AUTHaddauthority($dbh,$record,$authid,$authtypecode);
  		}
! 	# now, redirect to additem page
  		print $input->redirect("detail.pl?authid=$authid");
-  		build_tabs ($template, $record, $dbh,$encoding);
-  		build_hidden_data;
  		exit;
  	} else {
  	# it may be a duplicate, warn the user and do nothing
  		$template->param(
!  			duplicateauthnumber		=> $duplicateauthnumber,
!  			duplicateauthid				=> $duplicateauthid,
!  			duplicateauthvalue			=> $duplicateauthvalue,
! 			);
! 		warn " AUTH : ".$record->as_formatted,
!  		build_tabs ($template, $record, $dbh,$encoding);
!  		build_hidden_data;
  	}
  #------------------------------------------------------------------------------------------------------------------------------
--- 344,358 ----
  			($authid) = AUTHaddauthority($dbh,$record,$authid,$authtypecode);
  		}
! 	# now, redirect to detail page
  		print $input->redirect("detail.pl?authid=$authid");
  		exit;
  	} else {
  	# it may be a duplicate, warn the user and do nothing
+ 		build_tabs ($template, $record, $dbh,$encoding);
+ 		build_hidden_data;
  		$template->param(
! 			duplicateauthid				=> $duplicateauthid,
! 			duplicateauthvalue				=> $duplicateauthvalue,
! 			 );
  	}
  #------------------------------------------------------------------------------------------------------------------------------
***************
*** 424,429 ****
  }
  
! # build_tabs ($template, $record, $dbh,$encoding);
! # build_hidden_data;
  $template->param(
  	authid                       => $authid,
--- 418,425 ----
  }
  
! if ($authid) {
! 	build_tabs ($template, $record, $dbh,$encoding);
! 	build_hidden_data;
! }
  $template->param(
  	authid                       => $authid,