added more restrictive time parsing

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index f5263a271f55d20d9fd49b811bf389ff0d03ec3b..6c3ff30af271f7d31a3657c82dd01500c4cf9446 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -65,9 +65,9 @@ sub cltounix
        my $date = shift;
        my $time = shift;
 
-       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)$/;
        $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");
 }

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 5e4dd4d9efcc92880361e07a55bba4298c78a249..fd78191479e9e171c0a6ab5003bf6ac664c89808 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -64,7 +64,7 @@ package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.23";                             # the version no of the software
+$version = "1.24";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name