X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=3b701ebbc6da5b83953782c99e14fc9a6d4d548e;hb=dbf7523a9b228dbdf1d03109afde351b8b194fab;hp=4ea3782ef4ccda85415b55a995cec44673cccdd9;hpb=6b6eda0362049fd67809f2789e523708a1a8cb13;p=spider.git diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm index 4ea3782e..3b701ebb 100644 --- a/perl/DXUtil.pm +++ b/perl/DXUtil.pm @@ -17,7 +17,7 @@ use strict; use vars qw($VERSION $BRANCH); $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0; +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); $main::build += $VERSION; $main::branch += $BRANCH; @@ -371,7 +371,7 @@ sub is_digits # does it look like a qra locator? sub is_qra { - return $_[0] =~ /^[A-Za-z][A-Za-z]\d\d[A-Za-z][A-Za-z]$/o; + return $_[0] =~ /^[A-Ra-r][A-Ra-r]\d\d[A-Xa-x][A-Xa-x]$/; } # does it look like a valid lat/long