From: minima <minima>
Date: Tue, 6 Sep 2005 21:12:01 +0000 (+0000)
Subject: fix duplication of WWV spots
X-Git-Tag: 1.53~124
X-Git-Url: http://dxspider.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c73895f5ea983497905ce9acc12615e3f35f870a;p=spider.git

fix duplication of WWV spots
---

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index a7ef5562..981d5d86 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1244,11 +1244,11 @@ sub handle_23
 			return;
 		}
 	}
+	$_[7] =~ s/-\d+$//o;		# remove spotter's ssid
 	if (Geomag::dup($d,$sfi,$k,$i,$_[6],$_[7])) {
 		dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chanerr');
 		return;
 	}
-	$_[7] =~ s/-\d+$//o;		# remove spotter's ssid
 		
 	# note this only takes the first one it gets
 	Geomag::update($d, $_[2], $sfi, $k, $i, @_[6..8], $r);
diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index 022c4519..a2477821 100644
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -98,7 +98,7 @@ sub update
 		(@allowed == 0 && @denied == 0)) {
 		
 		#	my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime));
-		if ($mydate >= $date) {
+		if ($mydate > $date) {
 			if ($myr) {
 				$r = 0 + $myr;
 			} else {