projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added some anti thrash code for crossing messages
[spider.git]
/
perl
/
DXUtil.pm
diff --git
a/perl/DXUtil.pm
b/perl/DXUtil.pm
index 6c3ff30af271f7d31a3657c82dd01500c4cf9446..a1fb13ba2d34771044598ca3753f8a4238754830 100644
(file)
--- a/
perl/DXUtil.pm
+++ b/
perl/DXUtil.pm
@@
-13,11
+13,18
@@
use Carp;
require Exporter;
@ISA = qw(Exporter);
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);
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
# a full time for logging and other purposes
sub atime
@@
-64,12
+71,16
@@
sub cltounix
{
my $date = shift;
my $time = shift;
{
my $date = shift;
my $time = shift;
+ my ($thisyear) = (gmtime)[5] + 1900;
return 0 unless $date =~ /^\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 $time =~ /^([012]\d)([012345]\d)Z$/;
$time = "$1:$2 +0000";
$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 == -1 ? undef : $r;
}
# turn a latitude in degrees into a string
}
# turn a latitude in degrees into a string
@@
-164,3
+175,11
@@
sub print_all_fields
return @out;
}
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 . '$';
+}