projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes
[spider.git]
/
perl
/
DXUtil.pm
diff --git
a/perl/DXUtil.pm
b/perl/DXUtil.pm
index 07e86cea4a7d5254d8415c49ddecd23f94d3b078..2e8a528475ba9bcc75517512d36d5dc94440b6f4 100644
(file)
--- a/
perl/DXUtil.pm
+++ b/
perl/DXUtil.pm
@@
-16,7
+16,7
@@
require Exporter;
@ISA = qw(Exporter);
@EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf
parray parraypairs shellregex readfilestr writefilestr
@ISA = qw(Exporter);
@EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf
parray parraypairs shellregex readfilestr writefilestr
- print_all_fields cltounix
iscallsign
unpad is_callsign
+ print_all_fields cltounix unpad is_callsign
is_freq is_digits is_pctext is_pcflag insertitem deleteitem
);
is_freq is_digits is_pctext is_pcflag insertitem deleteitem
);
@@
-210,15
+210,6
@@
sub shellregex
return '^' . $in . "\$";
}
return '^' . $in . "\$";
}
-# start an attempt at determining whether this string might be a callsign
-sub iscallsign
-{
- my $call = uc shift;
- return 1 if $call =~ /^[A-Z]+\d+[A-Z]+/;
- return 1 if $call =~ /^\d+[A-Z]\d+[A-Z]+/;
- return undef;
-}
-
# read in a file into a string and return it.
# the filename can be split into a dir and file and the
# file can be in upper or lower case.
# read in a file into a string and return it.
# the filename can be split into a dir and file and the
# file can be in upper or lower case.
@@
-313,7
+304,7
@@
sub unpad
# check that a field only has callsign characters in it
sub is_callsign
{
# check that a field only has callsign characters in it
sub is_callsign
{
- return $_[0] =~ /^
[A-Z0-9
\-]+$/;
+ return $_[0] =~ /^
(?:[A-Z]{1,2}\d+|\d[A-Z]\d+)[A-Z0-9\/
\-]+$/;
}
# check that a PC protocol field is valid text
}
# check that a PC protocol field is valid text