X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=73cda964733d53ea257a006ac8395af7ffe1b11c;hb=5bbe803ffc8771aa87c9d37ca92170f13bbc6bc1;hp=b04cf4905d87435c37e50568c99d48014450264c;hpb=bd8b8aa6d37a7dde70d093c5552c29f519ac9613;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index b04cf490..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
@@ -549,7 +550,7 @@ sub difft
 	if (ref $b eq 'ARRAY') {
 		$t = $b->[1] - $b->[0];
 	} else {
-		if ($adds && $adds >= $b) {
+		if ($adds && $adds =~ /^\d+$/ && $adds >= $b) {
 			$t = $adds - $b;
 			$adds = shift;
 		} else {