2. Add full individual checking for all PC protocol fields in all messages

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index aad4696565e1a9e8a709572b8467432b9fa7d011..0fb6b8dbb848cc3c9aaf669fb1987e780f726fac 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -16,7 +16,8 @@ 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 unpad
+             print_all_fields cltounix iscallsign unpad is_callsign
+                        is_freq is_digits
             );
 
 @month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
@@ -284,11 +285,37 @@ sub writefilestr
 sub unpad
 {
        my $s = shift;
-       $s =~ s/^\s+|\s+$//;
+       $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] !~ /[^\x20-\xA8\xE0-\xEF]/;
+}
 
+# 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]/;
+}