X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=93030bfc88e785987c49b7f9e85d334ffc6ba43a;hb=601ea9fb47810209aeedef1a3041df5a916964f3;hp=2e7536accabbbfd749f68f20ac20b907df231d3f;hpb=d7dbb7fe3680afb068ffc585b1f95690008a9a7d;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 2e7536ac..93030bfc 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -3,28 +3,30 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXUtil;
 
+
 use Date::Parse;
 use IO::File;
 use File::Copy;
 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);
 @EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf 
-			 parray parraypairs phex shellregex readfilestr writefilestr
+			 parray parraypairs phex phash shellregex readfilestr writefilestr
 			 filecopy ptimelist
-             print_all_fields cltounix unpad is_callsign is_latlong
+             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_prefix dd is_ipaddr $pi $d2r $r2d localdata localdata_mv
             );
 
 
@@ -36,6 +38,11 @@ require Exporter;
 		   ']' => ']'
 );
 
+$pi = 3.141592653589;
+$d2r = ($pi/180);
+$r2d = (180/$pi);
+
+
 # a full time for logging and other purposes
 sub atime
 {
@@ -194,7 +201,7 @@ sub parraypairs
 	my $ref = shift;
 	my $i;
 	my $out;
-  
+
 	for ($i = 0; $i < @$ref; $i += 2) {
 		my $r1 = @$ref[$i];
 		my $r2 = @$ref[$i+1];
@@ -205,6 +212,20 @@ sub parraypairs
 	return $out;
 }
 
+# take the arg as a hash reference and print it out as such
+sub phash
+{
+	my $ref = shift;
+	my $out;
+
+	while (my ($k,$v) = each %$ref) {
+		$out .= "${k}=>$v, ";
+	}
+	chop $out;					# remove last space
+	chop $out;					# remove last comma
+	return $out;
+}
+
 sub _sort_fields
 {
 	my $ref = shift;
@@ -362,7 +383,19 @@ 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
+					 $!x;
+}
+
+# check that a field only has callsign characters in it but has more than the standard 3 callsign letters
+sub is_long_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,5}                                 # 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
@@ -413,6 +446,12 @@ sub is_latlong
 	return $_[0] =~ /^\s*\d{1,2}\s+\d{1,2}\s*[NnSs]\s+1?\d{1,2}\s+\d{1,2}\s*[EeWw]\s*$/;
 }
 
+# is it an ip address?
+sub is_ipaddr
+{
+    return $_[0] =~ /^\d+\.\d+\.\d+\.\d+$/ || $_[0] =~ /^[0-9a-f:]+$/;
+}
+
 # insert an item into a list if it isn't already there returns 1 if there 0 if not
 sub insertitem
 {
@@ -435,3 +474,35 @@ sub deleteitem
 	return $n - @$list;
 }
 
+# find the correct local_data directory
+# basically, if there is a local_data directory with this filename and it is younger than the
+# equivalent one in the (system) data directory then return that name rather than the system one
+sub localdata
+{
+	my $ifn = shift;
+	my $ofn = "$main::data/$ifn";
+	my $tfn;
+	
+	if (-e "$main::local_data") {
+		$tfn = "$main::local_data/$ifn";
+		if (-e $tfn && -e $ofn) {
+			$ofn = $tfn if -M $tfn < -M $ofn;
+		} elsif (-e $tfn) {
+			$ofn = $tfn;
+		}
+	}
+
+	return $ofn;
+}
+
+# move a file or a directory from data -> local_data if isn't there already
+sub localdata_mv
+{
+	my $ifn = shift;
+	if (-e "$main::data/$ifn" ) {
+		unless (-e "$main::local_data/$ifn") {
+			move("$main::data/$ifn", "$main::local_data/$ifn") or die "localdata_mv: cannot move $ifn from '$main::data' -> '$main::local_data' $!\n";
+		}
+	}
+}
+