X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXUtil.pm;h=868110ea36d6e7de266d4c7e28a704181787b276;hb=77727aa5c288b8b34cb0e05cea45a367fa1f9b6c;hp=f5263a271f55d20d9fd49b811bf389ff0d03ec3b;hpb=fbf952ad4e29eb8132007d0f1f3dc5eb1f4a0ff4;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index f5263a27..868110ea 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -64,12 +64,16 @@ sub cltounix
 {
 	my $date = shift;
 	my $time = shift;
+	my ($thisyear) = (gmtime)[5] + 1900;
 
-	return 0 unless /^\s*(\d+)-(\w\w\w)-([12][90]\d\d)$/;
+	return 0 unless $date =~ /^\s*(\d+)-(\w\w\w)-([12][90]\d\d)$/;
+	return 0 if $3 > 2036;
+	return 0 unless abs($thisyear-$3) <= 1;
 	$date = "$1 $2 $3";
-	return 0 unless /^(\d\d)(\d\d)Z$/;
+	return 0 unless $time =~ /^([012]\d)([012345]\d)Z$/;
 	$time = "$1:$2 +0000";
-	return str2time("$date $time");
+	my $r = str2time("$date $time");
+	return $r == -1 ? undef : $r;
 }
 
 # turn a latitude in degrees into a string