X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=20837f2f6494f1f5d7645e3d96c41c4a5d46eb8d;hb=86d0e8cc034db0b0d23afc09b6f596c38a57885d;hp=91c636910bc5a0fcba3986a7bf84498829172d18;hpb=59bc57a3789ea433e1edb6e41c47ecf0aba95705;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 91c63691..20837f2f 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 difft parraydifft
+			 diffms _diffms difft parraydifft is_ztime
             );
 
 
@@ -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,2})      # main prefix one (required) 
 					  [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
 {
@@ -548,15 +554,14 @@ sub difft
 	$t -= $d * 86400;
 	$h = int $t / 3600;
 	$out .= sprintf ("%s${h}h", $adds?' ':'') if $h;
-#	$out .= "${h}h" if $h || $d;
 	$t -= $h * 3600;
 	$m = int $t / 60;
 	$out .= sprintf ("%s${m}m", $adds?' ':'') if $m;
-#	$out .= "${m}m" if $m || $h || $d;
-	$s = int $t % 60;
-	$out .= sprintf ("%s${s}s", $adds?' ':'') if $s;
-	#	$out .= "${s}s";
-	$out ||= sprintf ("%s0s", $adds?' ':'');
+	if ($d == 0 && $adds || $adds == 2) {
+		$s = int $t % 60;
+		$out .= sprintf ("%s${s}s", $adds?' ':'') if $s;
+		$out ||= sprintf ("%s0s", $adds?' ':'');
+	}
 	return $out;
 }