X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=2e8a528475ba9bcc75517512d36d5dc94440b6f4;hb=1f1ba20386876b3d2a74e5e4d77bf7119a04610b;hp=21ae3e2354e620b7607e265adcf8c747cdb76ad0;hpb=647730580f6fe6ad14ee8445f0d5d583390cb130;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 21ae3e23..2e8a5284 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -16,7 +16,7 @@ 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 is_callsign
+             print_all_fields cltounix unpad is_callsign
 			 is_freq is_digits is_pctext is_pcflag insertitem deleteitem
             );
 
@@ -134,7 +134,7 @@ sub promptf
 		my $dd = new Data::Dumper([$value]);
 		$dd->Indent(0);
 		$dd->Terse(1);
-		$dd->Quotekeys($] < 5.005 ? 1 : 0);
+		$dd->Quotekeys(0);
 		$value = $dd->Dumpxs;
 	}
 	$prompt = sprintf "%15s: %s", $prompt, $value;
@@ -210,15 +210,6 @@ sub shellregex
 	return '^' . $in . "\$";
 }
 
-# start an attempt at determining whether this string might be a callsign
-sub iscallsign
-{
-	my $call = uc shift;
-	return 1 if $call =~ /^[A-Z]+\d+[A-Z]+/;
-	return 1 if $call =~ /^\d+[A-Z]\d+[A-Z]+/;
-	return undef;
-}
-
 # read in a file into a string and return it. 
 # the filename can be split into a dir and file and the 
 # file can be in upper or lower case.
@@ -313,7 +304,7 @@ sub unpad
 # check that a field only has callsign characters in it
 sub is_callsign
 {
-	return $_[0] =~ /^[A-Z0-9\-]+$/;
+	return $_[0] =~ /^(?:[A-Z]{1,2}\d+|\d[A-Z]\d+)[A-Z0-9\/\-]+$/;
 }
 
 # check that a PC protocol field is valid text