X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=73cda964733d53ea257a006ac8395af7ffe1b11c;hb=e2253ae6afcca0762c96034e38b53493048a5dd0;hp=5edb1994a3ac80f3d496c6d0bc61b5364cf3abb6;hpb=36fb54df677f2db28b1e8ea098d5d492ad872896;p=spider.git diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm index 5edb1994..73cda964 100644 --- a/perl/DXUtil.pm +++ b/perl/DXUtil.pm @@ -478,19 +478,20 @@ sub deleteitem sub localdata { my $ifn = shift; - my $ofn = "$main::local_data/$ifn"; - my $tfn; + my $lfn = "$main::local_data/$ifn"; + my $dfn = "$main::data/$ifn"; if (-e "$main::local_data") { - $tfn = "$main::data/$ifn"; - if ((-e $tfn) && (-e $ofn)) { - $ofn = $tfn if -M $ofn < -M $tfn; + if ((-e $dfn) && (-e $lfn)) { + $lfn = $dfn if -M $dfn < -M $lfn; } else { - $ofn = $tfn if -e $tfn; + $lfn = $dfn if -e $dfn; } + } else { + $lfn = $dfn; } - return $ofn; + return $lfn; } # move a file or a directory from data -> local_data if isn't there already