sort out the filtering system

[spider.git] / cmd / clear / announce.pl

diff --git a/cmd/clear/announce.pl b/cmd/clear/announce.pl
index 7e41c475b80e2f0ee0a010add1d7e3011d5bdbed..98fb5b873104f040ea812bee4ae09c391457509c 100644 (file)
--- a/cmd/clear/announce.pl
+++ b/cmd/clear/announce.pl
@@ -8,11 +8,10 @@
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
 my @out;
-my $dxchan = $self;
 my $sort = 'ann';
 my $flag;
 my $fno = 1;
-my $call = $dxchan->call;
+my $call = $self->call;
 my $f;
 
 if ($self->priv >= 8) {
@@ -31,8 +30,8 @@ if ($self->priv >= 8) {
 
 $fno = shift @f if @f && $f[0] =~ /^\d|all$/;
 
-my $filter = Filter::read_in($sort, $call, $flag);
-Filter::delete($sort, $call, $flag, $fno);
+my $filter =  Filter::read_in($sort, $call, $flag);
+Filter::delete($sort, $call, $flag, $fno, $self);
 $flag = $flag ? "input " : "";
 push @out, $self->msg('filter4', $flag, $sort, $fno, $call);
 return (1, @out);