limited the length of announces that are views for deduping

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ebc23561dae10ac0c7cf4760836870b96b01cbd9..11d37f259f473f1c3a01f7568bd1698a68f7012f 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -28,16 +28,18 @@ use Local;
 use Carp;
 
 use strict;
-use vars qw($me $pc11_max_age $pc11_dup_age $pc23_dup_age 
-                       %spotdup %wwvdup $last_hour %pings %rcmds 
+use vars qw($me $pc11_max_age $pc23_max_age $pc11_dup_age $pc23_dup_age
+                       %spotdup %wwvdup $last_hour %pings %rcmds
                        %nodehops @baddx $baddxfn $pc12_dup_age
-                       %anndup $allowzero);
+                       %anndup $allowzero, $pc12_dup_lth);
 
 $me = undef;                                   # the channel id for this cluster
 $pc11_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc11
+$pc23_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc23
 $pc11_dup_age = 24*3600;               # the maximum time to keep the spot dup list for
 $pc23_dup_age = 24*3600;               # the maximum time to keep the wwv dup list for
-$pc12_dup_age = 24*3600;               # the maximum time to keep the ann dup list for
+$pc12_dup_age = 12*3600;               # the maximum time to keep the ann dup list for
+$pc12_dup_lth = 72;                            # the length of ANN text to save for deduping 
 %spotdup = ();                             # the pc11 and 26 dup hash 
 %wwvdup = ();                              # the pc23 and 27 dup hash
 %anndup = ();                               # the PC12 dup hash
@@ -209,7 +211,7 @@ sub normal
                        
                        # store it away
                        my $spotter = $field[6];
-                       $spotter =~ s/-\d+$//o; # strip off the ssid from the spotter
+                       $spotter =~ s/-[\@\d]+$//o;     # strip off the ssid from the spotter
                        
                        # do some de-duping
                        my $freq = $field[1] - 0;
@@ -259,8 +261,8 @@ sub normal
                }
                
                if ($pcno == 12) {              # announces
-                       # announce duplicate checking
-                       my $text = uc unpad($field[3]);
+                       # announce duplicate checking
+                       my $text = substr(uc unpad($field[3]), 0, $pc12_dup_lth);
                        my $dupkey = $field[1].$field[2].$text.$field[4].$field[6];
                        if ($anndup{$dupkey}) {
                                dbg('chan', "Duplicate Announce ignored\n");
@@ -512,7 +514,7 @@ sub normal
                                dbg('chan', "Dup WWV Spot ignored\n");
                                return;
                        }
-                       if ($d > $main::systime + 900 || $field[2] < 0 || $field[2] > 23) {
+                       if ($d < $main::systime - $pc23_max_age || $d > $main::systime + 900 || $field[2] < 0 || $field[2] > 23) {
                                dbg('chan', "WWV Date ($field[1] $field[2]) out of range");
                                return;
                        }
@@ -811,7 +813,13 @@ sub send_dx_spot
        # taking into account filtering and so on
        foreach $dxchan (@dxchan) {
                my $routeit;
-               my ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} ) if $dxchan->{spotfilter};
+               my ($filter, $hops);
+
+               if ($dxchan->{spotfilter}) {
+                   ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} );
+                       next unless $filter;
+               }
+               
                if ($dxchan->is_ak1a) {
                        next if $dxchan == $self;
                        if ($hops) {