X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=018a404a6249baa43fe2987ff24520c25cf33d59;hb=980b697bd47c8f575b1c9a7f01f9b01adc6746bd;hp=9d475ed89c8f2f17713b3aabdc9aa6c79d93d4df;hpb=881637ac550fc824c3f8784f7fa8253b47ef5a64;p=spider.git diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm index 9d475ed8..018a404a 100644 --- a/perl/DXUtil.pm +++ b/perl/DXUtil.pm @@ -333,7 +333,7 @@ sub unpad # check that a field only has callsign characters in it sub is_callsign { - return $_[0] =~ /^(?:[A-Z]{1,2}\d+|\d[A-Z]\d+)[A-Z]+(?:-\d{1,2}|\/[A-Z0-9]+)?$/; + return $_[0] =~ /^(?:[A-Z]{1,2}\d+|\d[A-Z]\d+)[A-Z]{1,3}(?:-\d{1,2}|\/(?:[A-Z]{1,2}\d{0,2}|\d[A-Z]\d{0,2}))?$/; } # check that a PC protocol field is valid text