{
my $self = shift;
- my $hops = undef;
-
my $filter;
my @keys = sort $self->getfilkeys;
my $key;
}
}
- # hops are done differently
- if ($self->{hops}) {
- my ($comp, $ref);
- while (($comp, $ref) = each %{$self->{hops}}) {
- my ($field, $h) = @$ref;
- if ($_[$field] =~ m{$comp}) {
- $hops = $h;
- last;
- }
- }
- }
+ # hops are done differently (simply)
+ my $hops = $self->{hops} if exists $self->{hops};
+
return ($r, $hops);
}
sub print
{
my $self = shift;
+ my $name = shift || $self->{name};
+ my $sort = shift || $self->{sort};
+ my $flag = shift || "";
my @out;
- my $name = $self->{name};
$name =~ s/.pl$//;
- push @out, join(' ', $name , ':', $self->{sort});
+ push @out, join(' ', $name , ':', $sort, $flag);
my $filter;
my $key;
foreach $key (sort $self->getfilkeys) {
my $filter = $self->{$key};
- if ($filter->{reject} && exists $filter->{reject}->{user}) {
+ if (exists $filter->{reject} && exists $filter->{reject}->{user}) {
push @out, ' ' . join(' ', $key, 'reject', $filter->{reject}->{user});
}
- if ($filter->{accept} && exists $filter->{accept}->{user}) {
+ if (exists $filter->{accept} && exists $filter->{accept}->{user}) {
push @out, ' ' . join(' ', $key, 'accept', $filter->{accept}->{user});
}
}
}
$filter = Filter::read_in($sort, $call, $flag);
- $filter = Filter->new($sort, $call, $flag) unless $filter;
+ $filter = Filter->new($sort, $call, $flag) if !$filter || $filter->isa('Filter::Old');
$ntoken++;
next;
}
}
+sub print
+{
+ my $self = shift;
+ my $call = shift;
+ my $sort = shift;
+ my $flag = shift || "";
+ return "$call: Old Style Filter $flag $sort";
+}
1;
__END__