X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=2c05372c0f31b2d198a8959900ef8e2827b44817;hb=c5e90df0d93d141f8687556a708068521b9b8f77;hp=d1079035b1ada28fa5b1133ef3c8bd06a3d3ea5c;hpb=1910df7183401a62084e85c3ace179df492a6fbe;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index d1079035..2c05372c 100644
--- 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
+			 is_freq is_digits is_pctext is_pcflag insertitem deleteitem
             );
 
 @month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
@@ -292,17 +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 set correctly
+# 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\.]+$/;
+}
+
+# check that a thing is just digits
+sub is_digits
+{
+	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;
 }