fixed booboos in the protocol checking

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 0911d6ff6ee415eed03e14ffaf18a1b6d4c2e546..286f6f223eb645cdd02f8fa835704a98d5deaaf2 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -12,13 +12,12 @@ use Date::Parse;
 use IO::File;
 use Data::Dumper;
 
-use DXDebug;
-
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf 
                         parray parraypairs shellregex readfilestr writefilestr
-             print_all_fields cltounix iscallsign
+             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);
@@ -281,3 +280,42 @@ sub writefilestr
                $fh->close;
        }
 }
+
+# remove leading and trailing spaces from an input string
+sub unpad
+{
+       my $s = shift;
+       $s =~ s/\s+$//;
+       $s =~ s/^\s+//;
+       return $s;
+}
+
+# check that a field only has callsign characters in it
+sub is_callsign
+{
+       return $_[0] =~ /^[A-Z0-9\-]+$/;
+}
+
+# check that a PC protocol field is valid text
+sub is_pctext
+{
+       return $_[0] =~ /^[\x09\x20-\xFF]+$/;
+}
+
+# check that a PC prot flag is fairly valid (doesn't check the difference between 1/0 and */-)
+sub is_pcflag
+{
+       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]+$/;
+}