fix duplication of WWV spots

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index a7ef556201d09a3dae888c1442e3d50f3d4aa415..981d5d860605ff02206b78856e3b7334fbee01ad 100644 (file)
--- 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 022c4519e6c7928f72f1ff616d632a16288b37d6..a247782199c7c3e12a05676596395c86d5aef6e1 100644 (file)
--- 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 {