X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=286f6f223eb645cdd02f8fa835704a98d5deaaf2;hb=4f444f8dd0c7a7bf53a8d40e4e0fbadf57d32ffb;hp=0fb6b8dbb848cc3c9aaf669fb1987e780f726fac;hpb=cdb2c0e3a1d778485f71d406a561b38ed5238dbc;p=spider.git diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm index 0fb6b8db..286f6f22 100644 --- 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 ); @month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); @@ -293,29 +293,29 @@ 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]+$/; }