think I have it working finally

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index a16789c7e31a5ee94e8353be9996265e790e92c5..f218d5f33e223ab0a7de0ca25422493c9c240aab 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -236,12 +236,13 @@ sub normal
                        # send it if it isn't the except list and isn't isolated and still has a hop count
                        foreach $dxchan (@dxchan) {
                                next if $dxchan == $self;
-                               my $routeit = adjust_hops($dxchan, $line);  # adjust its hop count by node name
                                my $filter = Filter::it($dxchan->{spotfilter}, @spot) if $dxchan->{spotfilter};
+                               my $routeit = adjust_hops($dxchan, $line);  # adjust its hop count by node name
+                               next unless $routeit;
                                if ($filter) {
                                        $dxchan->send($routeit) if $routeit;
                                } else {
-                                       $dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
+                                       $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
                                }                                       
                        }
 

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 6f21535a39c0d17d5db6484982ea73205ac256eb..75e34c116a7e7e2f11bb21047637eb37dc01ba63 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -69,7 +69,7 @@ sub add
        # automagically closes the output file (if any)). 
        $fp->writeunix($out[2], $buf);
   
-       return (@spot, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq);
+       return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq);
 }
 
 # search the spot database for records based on the field no and an expression