X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=0a1c83ddbce0278dbac19abfa5fc76d4678096c0;hb=e83b70ecab022dbbeac0b56f67ed2e4bed609e86;hp=a7cf9e6f9d96952db58fd4b9c4b41f493f51833f;hpb=3761cb3e0997a63ca4611f0c684474dd9bc80c9a;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index a7cf9e6f..0a1c83dd 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -222,8 +222,8 @@ sub normal
 			}
 
 			# are any of the crucial fields invalid?
-            if ($field[2] =~ /[a-z]/ || $field[6] =~ /[a-z]/ || $field[7] =~ /[a-z]/) {
-				dbg('chan', "Spot contains lower case callsigns, rejected");
+            if ($field[2] =~ /(?:^\s*$|[a-z])/ || $field[6] =~ /(?:^\s*$|[a-z])/ || $field[7] =~ /(?:^\s*$|[a-z])/) {
+				dbg('chan', "Spot contains lower case callsigns or blanks, rejected");
 				return;
 			}
 			
@@ -243,6 +243,20 @@ sub normal
 			# you should be able to route on any of these
             #
 			
+			# fix up qra locators of known users 
+			my $user = DXUser->get_current($spot[4]);
+			if ($user) {
+				my $qra = $user->qra;
+				if (!DXBearing::is_qra) {
+					my $lat = $user->lat;
+					my $long = $user->long;
+					if (defined $lat && defined $long) {
+						$user->qra(DXBearing::lltoqra($lat, $long)); 
+						$user->put;
+					}
+				}
+			}
+				
 			# local processing 
 			my $r;
 			eval {
@@ -654,6 +668,8 @@ sub normal
 				my ($lat, $long) = DXBearing::stoll($field[3]);
 				$user->lat($lat);
 				$user->long($long);
+				my $qra = $user->qra || DXBearing::lltoqra($lat, $long);
+				$qra = DXBearing::lltoqra($lat, $long) unless DXBearing::is_qra($qra);
 			} elsif ($field[2] == 4) {
 				$user->homenode($field[3]);
 			}