make setting of pc9x harder

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index ef6101cea44cb1c713d62cfc3ed30c1129d16ac1..35d656d7cfd84c91d0649a23d133a42ac6e62c45 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -106,7 +106,7 @@ sub handle_10
 #      RouteDB::update($to, $_[6]);
 
        # convert this to a PC93 and process it as such
-       $self->process(pc93($to, $from, $via, $_[3], $_[6]));
+       $self->normal(pc93($to, $from, $via, $_[3], $_[6]));
        return;
        
        # this is all redundant but kept for now for reference
@@ -617,7 +617,8 @@ sub handle_18
                }
                $self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/;
                if ($_[1] =~ /\bpc9x/) {
-                       $self->{do_pc9x}++;
+                       $self->{do_pc9x} = 1;
+                       dbg("Do px9x set on $self->{call}");
                }
        } else {
                $self->version(50.0);
@@ -1468,8 +1469,6 @@ sub handle_92
 
        my (@radd, @rdel);
        
-       $self->{do_pc9x} ||= 1;
-
        my $pcall = $_[1];
        unless ($pcall) {
                dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
@@ -1491,7 +1490,10 @@ sub handle_92
        my $parent = check_pc9x_t($pcall, $t, 92, 1) || return;
        my $oparent = $parent;
        
-       $parent->lastid->{92} = $t;
+       if (!$self->{do_pc9x} && $self->{call} eq $pcall && $self->state =~ /^init/) {
+               $self->{do_pc9x} = 1;
+               dbg("Do_px9x set on $pcall");
+       }
        $parent->do_pc9x(1);
        $parent->via_pc92(1);
 
@@ -1616,7 +1618,7 @@ sub handle_93
        my $line = shift;
        my $origin = shift;
 
-       $self->{do_pc9x} ||= 1;
+#      $self->{do_pc9x} ||= 1;
 
        my $pcall = $_[1];
        unless (is_callsign($pcall)) {