projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
detail change
[spider.git]
/
perl
/
DXUtil.pm
diff --git
a/perl/DXUtil.pm
b/perl/DXUtil.pm
index a1fb13ba2d34771044598ca3753f8a4238754830..c4abc15bef7021d76c2352f55278350f02b3e3c9 100644
(file)
--- a/
perl/DXUtil.pm
+++ b/
perl/DXUtil.pm
@@
-15,7
+15,7
@@
require Exporter;
@ISA = qw(Exporter);
@EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf
parray parraypairs shellregex
@ISA = qw(Exporter);
@EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf
parray parraypairs shellregex
- print_all_fields cltounix
+ print_all_fields cltounix
iscallsign
);
@month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
);
@month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
@@
-80,6
+80,7
@@
sub cltounix
return 0 unless $time =~ /^([012]\d)([012345]\d)Z$/;
$time = "$1:$2 +0000";
my $r = str2time("$date $time");
return 0 unless $time =~ /^([012]\d)([012345]\d)Z$/;
$time = "$1:$2 +0000";
my $r = str2time("$date $time");
+ return $r unless $r;
return $r == -1 ? undef : $r;
}
return $r == -1 ? undef : $r;
}
@@
-181,5
+182,14
@@
sub shellregex
{
my $in = shift;
$in =~ s{(.)} { $patmap{$1} || "\Q$1" }ge;
{
my $in = shift;
$in =~ s{(.)} { $patmap{$1} || "\Q$1" }ge;
- return '^' . $in . '$';
+ return '^' . $in . "\$";
+}
+
+# start an attempt at determining whether this string might be a callsign
+sub iscallsign
+{
+ my $call = shift;
+ return 1 if $call =~ /^\w+\d+/;
+ return 1 if $call =~ /^\d+\w+/;
+ return undef;
}
}