push non-pc9x nodes to the back for routing

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 7db433e5205f8273c6a00bc5d7f9fbc624a0147f..eea43772deb4f06eb0826c779abbf98959257259 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -1559,7 +1559,7 @@ sub pc92_handle_first_slot
        }
        $parent->here(Route::here($here));
        $parent->version($version || $pc19_version) if $version;
-       $parent->build($build) if $build && $build > $parent->build;
+       $parent->build($build) if $build;
        $parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
        return ($parent, @radd);
 }
@@ -1674,18 +1674,11 @@ sub handle_92
                # this is the main route section
                # here is where all the routes are created and destroyed
 
-               # cope with missing duplicate node calls in the first slot for A or D
+               # cope with missing duplicate node calls in the first slot
                my $me = $_[4] || '';
-               if (($sort eq 'A' || $sort eq 'D')) {
-                       $me ||= _encode_pc92_call($parent) if !$me ;
-               } else {
-                       unless ($me) {
-                               dbg("PCPROT: this type of PC92 *must* have a node call in the first slot, ignored") if is_dbg('chanerr');
-                               return;
-                       }
-               }
+               $me ||= _encode_pc92_call($parent) unless $me ;
 
-               my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} $me, @_[5 .. $#_];
+               my @ent = map {my @a = _decode_pc92_call($_); @a ? \@a : ()} grep {$_ && /^[0-7]/} $me, @_[5 .. $#_];
 
                if (@ent) {
 
@@ -1705,7 +1698,7 @@ sub handle_92
                # do a pass through removing any references to either locally connected nodes or mycall
                my @nent;
                for (@ent) {
-                       next unless $_;
+                       next unless $_ && @$_;
                        if ($_->[0] eq $main::mycall || DXChannel::get($_->[0])) {
                                dbg("PCPROT: $_->[0] refers to locally connected node, ignored") if isdbg('chanerr');
                                next;