X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=1291db3943ff07b75dd1fcd99377d35a6482b342;hb=69e2746d46e5f6095530e76297aeddc1f359d4fb;hp=07e3f4cb3bede190e80ae629259be3b8df7da646;hpb=ca18864d1264fadfe9869b630f05c950876c2169;p=spider.git diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm index 07e3f4cb..1291db39 100644 --- a/perl/DXUtil.pm +++ b/perl/DXUtil.pm @@ -13,11 +13,18 @@ use Carp; require Exporter; @ISA = qw(Exporter); -@EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf parray parraypairs +@EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf + parray parraypairs shellregex print_all_fields cltounix ); @month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); +%patmap = ( + '*' => '.*', + '?' => '.', + '[' => '[', + ']' => ']' +); # a full time for logging and other purposes sub atime @@ -72,7 +79,9 @@ sub cltounix $date = "$1 $2 $3"; return 0 unless $time =~ /^([012]\d)([012345]\d)Z$/; $time = "$1:$2 +0000"; - return str2time("$date $time"); + my $r = str2time("$date $time"); + return $r unless $r; + return $r == -1 ? undef : $r; } # turn a latitude in degrees into a string @@ -167,3 +176,11 @@ sub print_all_fields return @out; } +# generate a regex from a shell type expression +# see 'perl cookbook' 6.9 +sub shellregex +{ + my $in = shift; + $in =~ s{(.)} { $patmap{$1} || "\Q$1" }ge; + return '^' . $in . '$'; +}