projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moan about and then delete empty message files
[spider.git]
/
perl
/
DXUtil.pm
diff --git
a/perl/DXUtil.pm
b/perl/DXUtil.pm
index d1079035b1ada28fa5b1133ef3c8bd06a3d3ea5c..286f6f223eb645cdd02f8fa835704a98d5deaaf2 100644
(file)
--- a/
perl/DXUtil.pm
+++ b/
perl/DXUtil.pm
@@
-17,6
+17,7
@@
require Exporter;
@EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf
parray parraypairs shellregex readfilestr writefilestr
print_all_fields cltounix iscallsign unpad is_callsign
@EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf
parray parraypairs shellregex readfilestr writefilestr
print_all_fields cltounix iscallsign unpad is_callsign
+ is_freq is_digits is_pctext is_pcflag
);
@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);
@@
-292,17
+293,29
@@
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-Z0-9\-]+$
/;
}
# check that a PC protocol field is valid text
sub is_pctext
{
}
# check that a PC protocol field is valid text
sub is_pctext
{
- return $_[0]
!~ /[^\x20-\xA8\xE0-\xEF]
/;
+ return $_[0]
=~ /^[\x09\x20-\xFF]+$
/;
}
}
-# check that a PC prot flag is
set correctly
+# check that a PC prot flag is
fairly valid (doesn't check the difference between 1/0 and */-)
sub is_pcflag
{
sub is_pcflag
{
- return $_[0] !~ /^[^01\*]$/;
+ return $_[0] =~ /^[01\*\-]+$/;
+}
+
+# check that a thing is a frequency
+sub is_freq
+{
+ return $_[0] =~ /^[\d\.]+$/;
+}
+
+# check that a thing is just digits
+sub is_digits
+{
+ return $_[0] =~ /^[\d]+$/;
}
}