X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=ff891427079e0da82419badd01176534a9be815e;hb=b4902de2965ded18eadc0588d24130b62274eec0;hp=0225f2f0c314a54b3d298fc9899a8a20e329d256;hpb=a76fe13d7a1e7e9003b11d5f5069903b81e2dc15;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 0225f2f0..ff891427 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -138,7 +138,7 @@ sub normal
 	eval {
 		$pcr = Local::pcprot($self, $pcno, @field);
 	};
-	dbg('local', "Local::pcprot error $@") if $@;
+#	dbg('local', "Local::pcprot error $@") if $@;
 	return if $pcr;
 	
  SWITCH: {
@@ -195,9 +195,9 @@ sub normal
 			# local processing 
 			my $r;
 			eval {
-				$r = Local::spot1($self, $freq, $field[2], $d, $text, $spotter, $field[7]);
+				$r = Local::spot($self, $freq, $field[2], $d, $text, $spotter, $field[7]);
 			};
-			dbg('local', "Local::spot1 error $@") if $@;
+#			dbg('local', "Local::spot1 error $@") if $@;
 			return if $r;
 
 			# send orf to the users
@@ -271,7 +271,7 @@ sub normal
 			
 			for ($i = 2; $i < $#field; $i++) {
 				my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
-				next if length $call < 3 || length $call > 8;
+				next if !$call || length $call < 3 || length $call > 8;
 				next if !$confmode;
 				$call = uc $call;
 				next if DXCluster->get_exact($call); # we already have this (loop?)
@@ -390,15 +390,15 @@ sub normal
 				return;
 			}
 			$wwvdup{$dupkey} = $d;
-			$field[6] =~ s/-\d+$//o            # remove spotter's ssid
+			$field[6] =~ s/-\d+$//o;            # remove spotter's ssid
 		
 			my $wwv = Geomag::update($d, $field[2], $sfi, $k, $i, @field[6..$#field]);
 
 			my $r;
 			eval {
-				$r = Local::wwv2($self, $field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
+				$r = Local::wwv($self, $field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
 			};
-			dbg('local', "Local::wwv2 error $@") if $@;
+#			dbg('local', "Local::wwv2 error $@") if $@;
 			return if $r;
 
 			# DON'T be silly and send on PC27s!
@@ -545,7 +545,7 @@ sub normal
 		
 		if ($pcno == 50) {		# keep alive/user list
 			my $ref = DXCluster->get_exact($field[1]);
-			$ref->update_users($field[2]) if $ref;
+			$ref->update_users($field[2]) if $ref;			
 			last SWITCH;
 		}