X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=4e442140b82e9394422492bc639f5d3fd6ed8903;hb=856cb98bb0f72ea86ea13c3e91d93aee7796fe9f;hp=49cba9e972ad55fab0d4300c5d4eb72103254382;hpb=cd5b993f99b52d3c3c51779e9ea1fa150232225e;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 49cba9e9..4e442140 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -15,7 +15,7 @@ use Data::Dumper;
 
 use strict;
 
-use vars qw(@month %patmap @ISA @EXPORT);
+use vars qw(@month %patmap $pi $d2r $r2d @ISA @EXPORT);
 
 require Exporter;
 @ISA = qw(Exporter);
@@ -24,7 +24,7 @@ require Exporter;
 			 filecopy ptimelist
              print_all_fields cltounix unpad is_callsign is_long_callsign is_latlong
 			 is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem
-			 is_prefix dd is_ipaddr
+			 is_prefix dd is_ipaddr $pi $d2r $r2d
             );
 
 
@@ -36,6 +36,11 @@ require Exporter;
 		   ']' => ']'
 );
 
+$pi = 3.141592653589;
+$d2r = ($pi/180);
+$r2d = (180/$pi);
+
+
 # a full time for logging and other purposes
 sub atime
 {
@@ -376,7 +381,7 @@ sub is_callsign
 {
 	return $_[0] =~ m!^(?:[A-Z]{1,2}\d+ | \d[A-Z]{1,2}\d+)        # basic prefix
                        (?:/(?:[A-Z]{1,2}\d+ | \d[A-Z]{1,2}\d+))?  # / another one (possibly)
-					   [A-Z]{1,3}                                 # callsign letters
+					   [A-Z]{1,4}                                 # callsign letters
 					   (?:/(?:[A-Z]{1,2}\d+ | \d[A-Z]{1,2}\d+))?  # / another prefix possibly
                        (?:/[0-9A-Z]{1,2})?                        # /0-9A-Z+ possibly
 					   (?:-\d{1,2})?                              # - nn possibly