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

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index e93d7ab4..24fa840f 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -383,9 +383,9 @@ 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) 
-					  [A-Z]{1,5}                # callsign letters (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,8}                # callsign letters (required)
 					  (?:-(?:\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;
@@ -539,7 +539,7 @@ sub difft
 	if (ref $b eq 'ARRAY') {
 		$t = $b->[1] - $b->[0];
 	} else {
-		if ($adds >= $b) {
+		if ($adds && $adds >= $b) {
 			$t = $adds - $b;
 			$adds = shift;
 		} else {