projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change sh/dx backend to the Filter engine
[spider.git]
/
perl
/
Filter.pm
diff --git
a/perl/Filter.pm
b/perl/Filter.pm
index 6b5cad94e5b682ed504d1f03e9568a90751c62fb..2be5cd5bbb48537ed6d7d05333b799389cbf8ba7 100644
(file)
--- a/
perl/Filter.pm
+++ b/
perl/Filter.pm
@@
-364,7
+364,7
@@
use vars qw(@ISA);
# this is called as a subroutine not as a method
sub parse
{
# 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 $ntoken = 0;
my $fno = 1;
my $filter;
@@
-373,7
+373,8
@@
sub parse
my $user;
# check the line for non legal characters
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;
# add some spaces for ease of parsing
$line =~ s/([\(\)])/ $1 /g;
@@
-385,7
+386,7
@@
sub parse
while (@f) {
if ($ntoken == 0) {
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;
$call = shift @f;
if ($f[0] eq 'input') {
shift @f;
@@
-399,7
+400,7
@@
sub parse
$fno = 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++;
$filter = Filter->new($sort, $call, $flag) if !$filter || $filter->isa('Filter::Old');
$ntoken++;
@@
-537,7
+538,7
@@
sub parse
$user =~ s/\!/ not /g;
$user =~ s/\s+/ /g;
$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
}
# a filter accept/reject command