if ($filter->{reject} && exists $filter->{reject}->{code}) {
$type = 'reject';
$asc = $filter->{reject}->{user};
- if (&{$filter->{reject}->{code}}(\@_)) {
+ if (&{$filter->{reject}->{code}}(ref $_[0] ? $_[0] : \@_)) {
$r = 0;
last;
} else {
if ($filter->{accept} && exists $filter->{accept}->{code}) {
$type = 'accept';
$asc = $filter->{accept}->{user};
- if (&{$filter->{accept}->{code}}(\@_)) {
+ if (&{$filter->{accept}->{code}}(ref $_[0] ? $_[0] : \@_)) {
$r = 1;
last;
} else {
my $hops = $self->{hops} if exists $self->{hops};
if (isdbg('filter')) {
- my $args = join '\',\'', map {defined $_ ? $_ : 'undef'} @_;
+ my $args = join '\',\'', map {defined $_ ? $_ : 'undef'} (ref $_[0] ? @{$_[0]} : @_);
my $true = $r ? "OK " : "REJ";
my $sort = $self->{sort};
my $dir = $self->{name} =~ /^in_/i ? "IN " : "OUT";
# this is called as a subroutine not as a method
sub parse
{
- my ($self, $dxchan, $sort, $line) = @_;
+ my ($self, $dxchan, $sort, $line, $forcenew) = @_;
my $ntoken = 0;
my $fno = 1;
my $filter;
my $user;
# check the line for non legal characters
- return ('ill', $dxchan->msg('e19')) if $line !~ /{.*}/ && $line =~ /[^\s\w,_\-\*\/\(\)!]/;
+ dbg("Filter::parse line: '$line'") if isdbg('filter');
+ return ('ill', $dxchan->msg('e19')) if $line !~ /{.*}/ && $line =~ /[^\s\w,_\-\*\/\(\)\$!]/;
# add some spaces for ease of parsing
- $line =~ s/([\(\)])/ $1 /g;
+ $line =~ s/([\(\!\)])/ $1 /g;
$line = lc $line;
my @f = split /\s+/, $line;
my $conj = ' && ';
my $not = "";
+ my $lasttok = '';
while (@f) {
if ($ntoken == 0) {
- if (@f && $dxchan->priv >= 8 && ((is_callsign(uc $f[0]) && DXUser::get(uc $f[0])) || $f[0] =~ /(?:node|user)_default/)) {
+ if (!$forcenew && @f && $dxchan->priv >= 8 && ((is_callsign(uc $f[0]) && DXUser::get(uc $f[0])) || $f[0] =~ /(?:node|user)_default/)) {
$call = shift @f;
if ($f[0] eq 'input') {
shift @f;
$fno = shift @f;
}
- $filter = Filter::read_in($sort, $call, $flag);
+ $filter = Filter::read_in($sort, $call, $flag) unless $forcenew;
$filter = Filter->new($sort, $call, $flag) if !$filter || $filter->isa('Filter::Old');
$ntoken++;
my $tok = shift @f;
if ($tok eq '(') {
if ($s) {
- $s .= $conj;
- $user .= $conj;
+ unless ($lasttok eq '(') {
+ $s .= $conj ;
+ $user .= $conj;
+ }
$conj = "";
+ $lasttok = $tok;
}
if ($not) {
$s .= $not;
}
$s .= $tok;
$user .= $tok;
+ $lasttok = $tok;
next;
} elsif ($tok eq ')') {
$conj = ' && ';
$not ="";
$s .= $tok;
$user .= $tok;
+ $lasttok = $tok;
next;
} elsif ($tok eq 'all') {
$s .= '1';
last;
} elsif ($tok eq 'or') {
$conj = ' || ' if $conj ne ' || ';
+ $lasttok = $tok;
next;
} elsif ($tok eq 'and') {
$conj = ' && ' if $conj ne ' && ';
next;
} elsif ($tok eq 'not' || $tok eq '!') {
- $not = '!';
+ $not = '! ';
+ $lasttok = $tok;
next;
}
if (@f) {
my @val = split /,/, $val;
if ($s) {
- $s .= $conj ;
- $user .= $conj;
- $conj = ' && ';
+ unless ($lasttok eq '(') {
+ $s .= $conj ;
+ $user .= $conj;
+ $conj = ' && ';
+ }
}
-
if ($not) {
$s .= $not;
$user .= $not;
} else {
return ('no', $dxchan->msg('filter2', $tok));
}
+ $lasttok = $tok;
}
-
}
# tidy up the user string
$user =~ s/\!/ not /g;
$user =~ s/\s+/ /g;
- return (0, $filter, $fno, $user, "$s");
+ return (0, $filter, $fno, $user, $s);
}
# a filter accept/reject command