1. did some work on making talk more intelligent and fixed a>b problem.

[spider.git] / perl / Filter.pm

diff --git a/perl/Filter.pm b/perl/Filter.pm
index f9fa611a8ef37ad4d931d4d1a4a862d8fc4fa1a7..2c32bf025981465e9ae9b8f374fddeb2fa53527c 100644 (file)
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -30,6 +30,7 @@ use DXVars;
 use DXUtil;
 use DXDebug;
 use Data::Dumper;
+use Prefix;
 
 use strict;
 
@@ -195,7 +196,7 @@ sub it
        my $key;
        my $type = 'Dunno';
        my $asc = '?';
-       
+
        my $r = @keys > 0 ? 0 : 1;
        foreach $key (@keys) {
                $filter = $self->{$key};
@@ -225,7 +226,7 @@ sub it
        my $hops = $self->{hops} if exists $self->{hops};
 
        if (isdbg('filter')) {
-               my $args = join '\',\'', @_;
+               my $args = join '\',\'', map {defined $_ ? $_ : 'undef'} @_;
                my $true = $r ? "OK " : "REJ";
                my $sort = $self->{sort};
                my $dir = $self->{name} =~ /^in_/i ? "IN " : "OUT";
@@ -297,10 +298,23 @@ sub install
        $in = "in" if $name =~ s/^IN_//;
        $name =~ s/.PL$//;
                
-       my $dxchan = DXChannel->get($name);
-       if ($dxchan) {
+       my $dxchan;
+       my @dxchan;
+       if ($name eq 'NODE_DEFAULT') {
+               @dxchan = DXChannel::get_all_nodes();
+       } elsif ($name eq 'USER_DEFAULT') {
+               @dxchan = DXChannel::get_all_users();
+       } else {
+               $dxchan = DXChannel->get($name);
+               push @dxchan, $dxchan if $dxchan;
+       }
+       foreach $dxchan (@dxchan) {
                my $n = "$in$sort" . "filter";
-               $dxchan->$n($remove ? undef : $self);
+               my $i = $in ? 'IN_' : '';
+               my $ref = $dxchan->$n();
+               if (!$ref || ($ref && uc $ref->{name} eq "$i$name.PL")) {
+                       $dxchan->$n($remove ? undef : $self);
+               }
        }
 }
 
@@ -471,6 +485,25 @@ sub parse
                                                                push @t, "\$r->[$fref->[2]]==$_";
                                                        }
                                                        $s .= "(" . join(' || ', @t) . ")";
+                                               } elsif ($fref->[1] =~ /^n[ciz]$/ ) {    # for DXCC, ITU, CQ Zone    
+                                                       my @n;
+                                                       my $cmd = $fref->[1];
+                                                       foreach my $v (@val) {
+                                                               if ($v =~ /^\d+$/) {    
+                                                                       push @n, $v unless grep $_ eq $v, @n;
+                                                               } else {
+                                                                       my @pre = Prefix::extract($v);
+                                                                       return ('numpre', $dxchan->msg('e27', $_)) unless @pre;
+                                                                       shift @pre;
+                                                                       foreach my $p (@pre) {
+                                                                               my $n = $p->dxcc if $cmd eq 'nc' ;
+                                                                               $n = $p->itu if $cmd eq 'ni' ;
+                                                                               $n = $p->cq if $cmd eq 'nz' ;
+                                                                               push @n, $n unless grep $_ eq $n, @n;
+                                                                       }
+                                                               }
+                                                       }
+                                                       $s .= "(" . join(' || ', map {"\$r->[$fref->[2]]==$_"} @n) . ")";
                                                } elsif ($fref->[1] eq 'r') {
                                                        my @t;
                                                        for (@val) {
@@ -517,7 +550,9 @@ sub cmd
        return $dxchan->msg('filter5') unless $line;
 
        my ($r, $filter, $fno, $user, $s) = $self->parse($dxchan, $sort, $line);
-       return (1,$filter) if $r;
+       my $u = DXUser->get_current($user);
+       return (1, $dxchan->msg('isow', $user)) if $u && $u->isolate;
+       return (1, $filter) if $r;
 
        my $fn = "filter$fno";