added code to allow filtering on spot channel callsign

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 7f145114feb61ecd5a9f9c66af2a797b61fc6c7b..a6982f1f2bf53a47025e22200556f58c7ba39522 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -238,9 +238,10 @@ sub normal
                        foreach $dxchan (@dxchan) {
                                next if $dxchan == $self;
                                my $routeit;
-                               my ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @spot) if $dxchan->{spotfilter};
+                               my ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @spot, $self->{call} ) if $dxchan->{spotfilter};
                                if ($hops) {
-                                       $line =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
+                                       $routeit = $line;
+                                       $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
                                } else {
                                        $routeit = adjust_hops($dxchan, $line);  # adjust its hop count by node name
                                        next unless $routeit;
@@ -403,6 +404,7 @@ sub normal
                        
                        # queue mail
                        DXMsg::queue_msg(0);
+
                        return;
                }