X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=fc7cd024d7737a96326f8a4a69316069b8c696f4;hb=0e8259381a4d4f4ea9059cdabc0cc4c88e637a99;hp=6cf35b2bd77e3a398d652ba7d3f2af98f8e77228;hpb=6db883c129fb84bbf067861a1def1fd8120a32c8;p=spider.git

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 6cf35b2b..fc7cd024 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -340,13 +340,13 @@ 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]{1,3}(?:-\d{1,2}|\/(?:[A-Z]{1,2}\d{0,2}|\d[A-Z]\d{0,2}))?$/;
+	return $_[0] =~ /^(?:[A-Z]{1,2}\d+|\d[A-Z]{1,2}\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
 sub is_pctext
 {
-	return undef if $_[0] =~ /[\x00-\x08\x0a-\x1f\xf0-\xff]/;
+	return undef if $_[0] =~ /[\x00-\x08\x0a-\x1f\x80-\x9f]/;
 	return $_[0];
 }
 
@@ -371,7 +371,7 @@ sub is_digits
 # does it look like a qra locator?
 sub is_qra
 {
-	return $_[0] =~ /^[A-Za-z][A-Za-z]\d\d[A-Za-z][A-Za-z]$/o;
+	return $_[0] =~ /^[A-Ra-r][A-Ra-r]\d\d[A-Xa-x][A-Xa-x]$/;
 }
 
 # does it look like a valid lat/long