[Koha-cvs] CVS: koha/C4 AuthoritiesMarc.pm,1.9.2.4,1.9.2.5

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
	AuthoritiesMarc.pm 
Log Message:
fix for authority merging. There was a bug on official installs

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -r1.9.2.4 -r1.9.2.5
*** AuthoritiesMarc.pm	30 May 2005 11:24:15 -0000	1.9.2.4
--- AuthoritiesMarc.pm	31 May 2005 14:50:46 -0000	1.9.2.5
***************
*** 531,535 ****
  	&AUTHaddauthority($dbh,$record,$authid,AUTHfind_authtypecode($dbh,$authid));
  	# save the file in localfile/modified_authorities
! 	my $filename = C4::Context->config("intranetdir")."/localfile/modified_authorities/$authid.authid";
  	open AUTH, "> $filename";
  	print AUTH $authid;
--- 531,540 ----
  	&AUTHaddauthority($dbh,$record,$authid,AUTHfind_authtypecode($dbh,$authid));
  	# save the file in localfile/modified_authorities
! 	my $cgidir = C4::Context->intranetdir ."/cgi-bin";
! 	unless (opendir(DIR, "$cgidir")) {
! 			$cgidir = C4::Context->intranetdir."/";
! 	} 
! 
! 	my $filename = $cgidir."/localfile/modified_authorities/$authid.authid";
  	open AUTH, "> $filename";
  	print AUTH $authid;
***************
*** 912,915 ****
--- 917,923 ----
  # $Id$
  # $Log$
+ # Revision 1.9.2.5  2005/05/31 14:50:46  tipaul
+ # fix for authority merging. There was a bug on official installs
+ #
  # Revision 1.9.2.4  2005/05/30 11:24:15  tipaul
  # fixing a bug : when a field was repeated, the last field was also repeated. (Was due to the "empty" field in html between fields : to separate fields, in html, an empty field is automatically added. in AUTHhtml2marc, this empty field was not discarded correctly)