made filtering work properly for spots

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index b8ac3ead62ddc313c35edf2ef04fb91d220ffba2..5211b7aa622ec6553084b3371925bd0919d8405a 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -210,7 +210,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;
@@ -812,7 +812,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) {