X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=e93d7ab4e6d87bd37e1d07c88f4e0fd748dc8c64;hb=2520521008cdb3c5ab168c678c57130be712daee;hp=e77eb2947d80f8db249dc109c984ff070243b8cf;hpb=95cc9e6faf981379dfed2830fcfd4b5f3a0ff160;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index e77eb294..e93d7ab4 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -386,7 +386,7 @@ sub is_callsign
 					  (?:\d?[A-Z]{1,2}\d*/)?    # out of area prefix /  
 					  (?:\d?[A-Z]{1,2}\d+)      # 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;
 
@@ -554,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;
 }