Bug 4159 (Directory modified_authorities in tmp not localfile)

This commit is contained in:
Marcel de Rooy 2010-05-17 12:22:54 +02:00 committed by Henri-Damien LAURENT
parent a551717ecd
commit a7959b4011
1 changed files with 3 additions and 3 deletions

View File

@ -76,9 +76,9 @@ print "Merging\n" unless $noconfirm;
if ($batch) {
my @authlist;
my $cgidir = C4::Context->intranetdir ."/cgi-bin";
unless (opendir(DIR, "$cgidir/localfile/modified_authorities")) {
unless (opendir(DIR, "$cgidir/tmp/modified_authorities")) { #MR 030510
$cgidir = C4::Context->intranetdir;
opendir(DIR, "$cgidir/localfile/modified_authorities") || die "can't opendir $cgidir/localfile/modified_authorities: $!";
opendir(DIR, "$cgidir/tmp/modified_authorities") || die "can't opendir $cgidir/tmp/modified_authorities: $!"; #MR 030510
}
while (my $authid = readdir(DIR)) {
if ($authid =~ /\.authid$/) {
@ -87,7 +87,7 @@ if ($batch) {
my $MARCauth = GetAuthority($authid) ;
next unless ($MARCauth);
merge($authid,$MARCauth,$authid,$MARCauth) if ($MARCauth);
unlink $cgidir.'/localfile/modified_authorities/'.$authid.'.authid';
unlink $cgidir.'/tmp/modified_authorities/'.$authid.'.authid';
}
}
closedir DIR;