fix all DXChannel->get to ::get

[spider.git] / perl / Filter.pm

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 4443fc5570ac2360d40af67587c5d10f028aeec4..74f74d444dbc2ab34610071e1b8acb25d39e71cc 100644 (file)
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -35,10 +35,8 @@ use Prefix;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 use vars qw ($filterbasefn $in);
 
@@ -198,6 +196,7 @@ sub it
        my $key;
        my $type = 'Dunno';
        my $asc = '?';
+       my $data = ref $_[0] ? shift : \@_;
 
        my $r = @keys > 0 ? 0 : 1;
        foreach $key (@keys) {
@@ -205,7 +204,7 @@ sub it
                if ($filter->{reject} && exists $filter->{reject}->{code}) {
                        $type = 'reject';
                        $asc = $filter->{reject}->{user};
-                       if (&{$filter->{reject}->{code}}(\@_)) {
+                       if (&{$filter->{reject}->{code}}($data)) {
                                $r = 0;
                                last;
                        } else {
@@ -215,7 +214,7 @@ sub it
                if ($filter->{accept} && exists $filter->{accept}->{code}) {
                        $type = 'accept';
                        $asc = $filter->{accept}->{user};
-                       if (&{$filter->{accept}->{code}}(\@_)) {
+                       if (&{$filter->{accept}->{code}}($data)) {
                                $r = 1;
                                last;
                        } else {
@@ -228,7 +227,7 @@ sub it
        my $hops = $self->{hops} if exists $self->{hops};
 
        if (isdbg('filter')) {
-               my $args = join '\',\'', map {defined $_ ? $_ : 'undef'} @_;
+               my $args = join '\',\'', map {defined $_ ? $_ : 'undef'} @$data;
                my $true = $r ? "OK " : "REJ";
                my $sort = $self->{sort};
                my $dir = $self->{name} =~ /^in_/i ? "IN " : "OUT";
@@ -303,11 +302,11 @@ sub install
        my $dxchan;
        my @dxchan;
        if ($name eq 'NODE_DEFAULT') {
-               @dxchan = DXChannel::get_all_nodes();
+               @dxchan = grep{$_->is_node || $_->is_aranea} DXChannel::get_all();
        } elsif ($name eq 'USER_DEFAULT') {
                @dxchan = DXChannel::get_all_users();
        } else {
-               $dxchan = DXChannel->get($name);
+               $dxchan = DXChannel::get($name);
                push @dxchan, $dxchan if $dxchan;
        }
        foreach $dxchan (@dxchan) {