force pings (and other PC frames) to go down a local connection if

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 0fb6b8dbb848cc3c9aaf669fb1987e780f726fac..2c05372c0f31b2d198a8959900ef8e2827b44817 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -17,7 +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
-                        is_freq is_digits
+                        is_freq is_digits is_pctext is_pcflag insertitem deleteitem
             );
 
 @month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
@@ -293,29 +293,51 @@ sub unpad
 # 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
 {
-       return $_[0] !~ /[^\x20-\xA8\xE0-\xEF]/;
+       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\*\-]$/;
+       return $_[0] =~ /^[01\*\-]+$/;
 }
 
 # check that a thing is a frequency
 sub is_freq
 {
-       return $_[0] !~ /[^\d\.]/;
+       return $_[0] =~ /^[\d\.]+$/;
 }
 
 # check that a thing is just digits
 sub is_digits
 {
-       return $_[0] !~ /[^\d]/;
+       return $_[0] =~ /^[\d]+$/;
+}
+
+# insert an item into a list if it isn't already there returns 1 if there 0 if not
+sub insertitem
+{
+       my $list = shift;
+       my $item = shift;
+       
+       return 1 if grep {$_ eq $item } @$list;
+       push @$list, $item;
+       return 0;
+}
+
+# delete an item from a list if it is there returns no deleted 
+sub deleteitem
+{
+       my $list = shift;
+       my $item = shift;
+       my $n = @$list;
+       
+       @$list = grep {$_ ne $item } @$list;
+       return $n - @$list;
 }