X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FFilter.pm;h=74f74d444dbc2ab34610071e1b8acb25d39e71cc;hb=a472851a7e290dac262131fd7f73b567332df6e4;hp=fdc06d1ae87454d3f9a81772fd403c6c80e82c7e;hpb=10cd15ab627d2df5fbce79eb1388424051309f1a;p=spider.git

diff --git a/perl/Filter.pm b/perl/Filter.pm
index fdc06d1a..74f74d44 100644
--- 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;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 use vars qw ($filterbasefn $in);
 
@@ -92,7 +90,9 @@ sub compile
 	my $rr;
 	
 	if ($ref->{$ar} && exists $ref->{$ar}->{asc}) {
-		$ref->{$ar}->{code} = eval "sub { my \$r=shift; return $ref->{$ar}->{asc}; }" ;
+		my $s = $ref->{$ar}->{asc};	# an optimisation?
+		$s =~ s/\$r/\$_[0]/g;
+		$ref->{$ar}->{code} = eval "sub { $s }" ;
 		if ($@) {
 			my $sort = $ref->{sort};
 			my $name = $ref->{name};
@@ -196,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) {
@@ -203,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 {
@@ -213,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 {
@@ -226,7 +227,7 @@ sub it
 	my $hops = $self->{hops} if exists $self->{hops};
 
 	if (isdbg('filter')) {
-		my $args = join '\',\'', @_;
+		my $args = join '\',\'', map {defined $_ ? $_ : 'undef'} @$data;
 		my $true = $r ? "OK " : "REJ";
 		my $sort = $self->{sort};
 		my $dir = $self->{name} =~ /^in_/i ? "IN " : "OUT";
@@ -301,17 +302,18 @@ 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) {
 		my $n = "$in$sort" . "filter";
+		my $i = $in ? 'IN_' : '';
 		my $ref = $dxchan->$n();
-		if (!$ref || ($ref && uc $ref->{name} eq "$name.PL")) {
+		if (!$ref || ($ref && uc $ref->{name} eq "$i$name.PL")) {
 			$dxchan->$n($remove ? undef : $self);
 		}
 	}
@@ -367,7 +369,7 @@ sub parse
 	my $user;
 	
 	# check the line for non legal characters
-	return ('ill', $dxchan->msg('e19')) if $line =~ /[^\s\w,_\-\*\/\(\)]/;
+	return ('ill', $dxchan->msg('e19')) if $line =~ /[^\s\w,_\-\*\/\(\)!]/;
 	
 	# add some spaces for ease of parsing
 	$line =~ s/([\(\)])/ $1 /g;
@@ -443,12 +445,16 @@ sub parse
 
 				if ($s) {
 					$s .= $conj ;
-					$s .= $not;
 					$user .= $conj;
-					$user .= $not;
 					$conj = ' && ';
-					$not = "";
 				}
+
+				if ($not) {
+					$s .= $not;
+					$user .= $not;
+					$not = '';
+				}
+
 				$user .= "$tok $val";
 				
 				my $fref;
@@ -485,24 +491,15 @@ sub parse
 							}
 							$s .= "(" . join(' || ', @t) . ")";
 						} elsif ($fref->[1] =~ /^n[ciz]$/ ) {    # for DXCC, ITU, CQ Zone    
-							my @n;
 							my $cmd = $fref->[1];
-							foreach my $v (@val) {
-								if ($v =~ /^\d+$/) {	
-									push @n, $v unless grep $_ eq $v, @n;
-								} else {
-									my @pre = Prefix::extract($v);
-									return ('numpre', $dxchan->msg('e27', $_)) unless @pre;
-									shift @pre;
-									foreach my $p (@pre) {
-										my $n = $p->dxcc if $cmd eq 'nc' ;
-										$n = $p->itu if $cmd eq 'ni' ;
-										$n = $p->cq if $cmd eq 'nz' ;
-										push @n, $n unless grep $_ eq $n, @n;
-									}
-								}
-							}
-							$s .= "(" . join(' || ', map {"\$r->[$fref->[2]]==$_"} @n) . ")";
+							my @pre = Prefix::to_ciz($cmd, @val);
+							return ('numpre', $dxchan->msg('e27', $_)) unless @pre;
+							$s .= "(" . join(' || ', map {"\$r->[$fref->[2]]==$_"} @pre) . ")";
+						} elsif ($fref->[1] =~ /^ns$/ ) {    # for DXCC, ITU, CQ Zone    
+							my $cmd = $fref->[1];
+							my @pre = Prefix::to_ciz($cmd, @val);
+							return ('numpre', $dxchan->msg('e27', $_)) unless @pre;
+							$s .= "(" . "!\$USDB::present || grep \$r->[$fref->[2]] eq \$_, qw(" . join(' ' ,map {uc} @pre) . "))";
 						} elsif ($fref->[1] eq 'r') {
 							my @t;
 							for (@val) {