unrolled the checking in decode_input a bit

[spider.git] / perl / DXChannel.pm

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 17f34919e7eb970f4eef85a2cc893e3dd95469d2..d566c177c05f07a1ac0b76eac0419db98934010e 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -17,9 +17,9 @@
 #
 # PLEASE NOTE - I am a C programmer using this as a method of learning perl
 # firstly and OO about ninthly (if you don't like the design and you can't 
-# improve it with better OO by make it smaller and more efficient, then tough). 
+# improve it with better OO and thus make it smaller and more efficient, then tough). 
 #
-# Copyright (c) 1998 - Dirk Koopman G1TLH
+# Copyright (c) 1998-2000 - Dirk Koopman G1TLH
 #
 # $Id$
 #
@@ -87,7 +87,7 @@ use vars qw(%channels %valid);
                  pingave => '0,Ping ave time',
                  logininfo => '9,Login info req,yesno',
                  talklist => '0,Talk List,parray',
-                 node => '5,Node data',
+                 cluster => '5,Cluster data',
                 );
 
 # object destruction
@@ -133,12 +133,6 @@ sub alloc
        $self->{lang} = $main::lang if !$self->{lang};
        $self->{func} = "";
 
-       # get the filters
-       $self->{spotfilter} = Filter::read_in('spots', $call, 0);
-       $self->{wwvfilter} = Filter::read_in('wwv', $call, 0);
-       $self->{wcyfilter} = Filter::read_in('wcy', $call, 0);
-       $self->{annfilter} = Filter::read_in('ann', $call, 0);
-
        bless $self, $pkg; 
        return $channels{$call} = $self;
 }
@@ -446,12 +440,16 @@ sub decode_input
        my $chcall = (ref $dxchan) ? $dxchan->call : "UN.KNOWN";
        
        # the above regexp must work
-       if (!defined $sort || !defined $call || !defined  $line ||
-                  (ref $dxchan && $call ne $chcall)) {
+       unless (defined $sort && defined $call && defined $line) {
                $data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-               dbg('chan', "DUFF Line from $chcall: $data");
+               dbg('err', "DUFF Line on $chcall: $data");
                return ();
        }
+
+       if(ref($dxchan) && $call ne $chcall) {
+               dbg('err', "DUFF Line come in for $call on wrong channel $chcall" );
+               return();
+       }
        
        return ($sort, $call, $line);
 }