X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=b0d21db377ee62d8d7c847cfbc1dd4d1b4c0debc;hb=a3fd9341b7ce57dcc058b82cfba3f40f15631241;hp=b1ce88d6750634806eda9f336382cf221ec473be;hpb=324bd80ed4aef7e2636f5a03288788ce11ab2663;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index b1ce88d6..b0d21db3 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
@@ -385,19 +385,20 @@ sub normal
 				dbg('chan', "Dup WWV Spot ignored\n");
 				return;
 			}
-			if ($d > $main::systime + 900) {
+			if ($d > $main::systime + 900 || $field[2] < 0 || $field[2] > 23) {
 				dbg('chan', "WWV Date ($field[1] $field[2]) out of range");
 				return;
 			}
-			
 			$wwvdup{$dupkey} = $d;
+			$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!
@@ -544,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;
 		}