X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=a1fb13ba2d34771044598ca3753f8a4238754830;hb=2f4355fb63f336cce61887b189d5556faf1734d7;hp=81bace8ca1271ebc45021e3175cb80edc940592a;hpb=69c8aeb338cc485103e289fbab7ec4e7e056ed20;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 81bace8c..a1fb13ba 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
@@ -46,7 +53,7 @@ sub cldate
 	my $t = shift;
 	my ($sec,$min,$hour,$mday,$mon,$year) = gmtime((defined $t) ? $t : time);
 	$year += 1900;
-	my $buf = sprintf "%02d-%s-%04d", $mday, $month[$mon], $year;
+	my $buf = sprintf "%2d-%s-%04d", $mday, $month[$mon], $year;
 	return $buf;
 }
 
@@ -64,9 +71,16 @@ sub cltounix
 {
 	my $date = shift;
 	my $time = shift;
-	$date =~ s/^\s*(\d+)-(\w\w\w)-(19\d\d)$/$1 $2 $3/;
-	$time =~ s/^(\d\d)(\d\d)Z$/$1:$2 +0000/;
-	return str2time("$date $time");
+	my ($thisyear) = (gmtime)[5] + 1900;
+
+	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 $time =~ /^([012]\d)([012345]\d)Z$/;
+	$time = "$1:$2 +0000";
+	my $r = str2time("$date $time");
+	return $r == -1 ? undef : $r;
 }
 
 # turn a latitude in degrees into a string
@@ -148,11 +162,9 @@ sub print_all_fields
 {
 	my $self = shift;			# is a dxchan
 	my $ref = shift;			# is a thingy with field_prompt and fields methods defined
-	my @out = @_;
- 
+	my @out;
 	my @fields = $ref->fields;
 	my $field;
-	my @out;
 
 	foreach $field (sort @fields) {
 		if (defined $ref->{$field}) {
@@ -163,3 +175,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 . '$';
+}