X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=d23cb92ea7daa952d57c1deacaa843aa6b329f19;hb=157f14220c0cbc875729be41a3e3a2acd18f51e1;hp=28e7396dcebd3143d25d29b49c989e98c4c7592d;hpb=f6abc902d49e13eeca3ff50f84a74f28a3aa3390;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 28e7396d..d23cb92e 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -27,7 +27,7 @@ require Exporter;
              print_all_fields cltounix unpad is_callsign is_latlong
 			 is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem
 			 is_prefix dd is_ipaddr $pi $d2r $r2d localdata localdata_mv
-			 diffms _diffms
+			 diffms _diffms difft parraydifft is_ztime
             );
 
 
@@ -182,7 +182,7 @@ sub ptimelist
 	my $ref = shift;
 	my $out;
 	for (sort keys %$ref) {
-		$out .= "$_=$ref->{$_}, ";
+		$out .= "$_=" . atime($ref->{$_}) . ", ";
 	}
 	chop $out;
 	chop $out;
@@ -383,10 +383,10 @@ sub unpad
 sub is_callsign
 {
 	return $_[0] =~ m!^
-					  (?:\d?[A-Z]{1,2}\d*/)?    # out of area prefix /  
-					  (?:\d?[A-Z]{1,2}\d+)      # main prefix one (required) 
+					  (?:\d?[A-Z]{1,2}\d{0,2}/)?    # out of area prefix /  
+					  (?:\d?[A-Z]{1,2}\d{1,5})      # main prefix one (required) - lengthened for special calls 
 					  [A-Z]{1,5}                # callsign letters (required)
-					  (?:-(?:\d{1,2}|\#))?      # - nn possibly (eg G8BPQ-8) or -# (an RBN spot) 
+					  (?:-(?:\d{1,2}))?         # - nn possibly (eg G8BPQ-8)
 					  (?:/[0-9A-Z]{1,7})?       # / another prefix, callsign or special label (including /MM, /P as well as /EURO or /LGT) possibly
 					  $!x;
 
@@ -444,6 +444,12 @@ sub is_ipaddr
     return $_[0] =~ /^\d+\.\d+\.\d+\.\d+$/ || $_[0] =~ /^[0-9a-f:,]+$/;
 }
 
+# is it a zulu time hhmmZ
+sub is_ztime
+{
+	return $_[0] =~ /^(?:(?:2[0-3])|(?:[01][0-9]))[0-5][0-9]Z$/;
+}
+
 # insert an item into a list if it isn't already there returns 1 if there 0 if not
 sub insertitem
 {
@@ -472,15 +478,15 @@ sub deleteitem
 sub localdata
 {
 	my $ifn = shift;
-	my $ofn = "$main::data/$ifn";
+	my $ofn = "$main::local_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;
+		$tfn = "$main::data/$ifn";
+		if ((-e $tfn) && (-e $ofn)) {
+			$ofn = $tfn if -M $ofn < -M $tfn;
+		} else {
+			$ofn = $tfn if -e $tfn;
 		}
 	}
 
@@ -522,3 +528,52 @@ sub diffms
 	$s .= " $no lines" if $no;
 	DXDebug::dbg($s);
 }
+
+# expects either an array reference or two times (in the correct order [start, end])
+sub difft
+{
+	my $b = shift;
+	my $adds = shift;
+	
+	my $t;
+	if (ref $b eq 'ARRAY') {
+		$t = $b->[1] - $b->[0];
+	} else {
+		if ($adds >= $b) {
+			$t = $adds - $b;
+			$adds = shift;
+		} else {
+			$t = $main::systime - $b;
+		}
+	}
+	return '-(ve)' if $t < 0;
+	my ($d,$h,$m,$s);
+	my $out = '';
+	$d = int $t / 86400;
+	$out .= sprintf ("%s${d}d", $adds?' ':'') if $d;
+	$t -= $d * 86400;
+	$h = int $t / 3600;
+	$out .= sprintf ("%s${h}h", $adds?' ':'') if $h;
+	$t -= $h * 3600;
+	$m = int $t / 60;
+	$out .= sprintf ("%s${m}m", $adds?' ':'') if $m;
+	if ($d == 0 && $adds || $adds == 2) {
+		$s = int $t % 60;
+		$out .= sprintf ("%s${s}s", $adds?' ':'') if $s;
+		$out ||= sprintf ("%s0s", $adds?' ':'');
+	}
+	return $out;
+}
+
+# print an array ref of difft refs
+sub parraydifft
+{
+	my $r = shift;
+	my $out = '';
+	for (@$r) {
+		my $s = $_->[2] ? "($_->[2])" : '';
+		$out .= sprintf "%s=%s$s, ", atime($_->[0]), difft($_->[0], $_->[1]);
+	}
+	$out =~ s/,\s*$//;
+	return $out;
+}