X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FFilter.pm;h=a2f5ce46a7bac5f070e8531eaef59389e0f28b07;hb=221c5c06b353ae5ec43a7bb4448a4d087c0c7a03;hp=66c3ff7acb2aceb64b1a1ec1265c2cda8d94bcf3;hpb=5b9ab81174d4a7734c92af52da6ddf89e980e321;p=spider.git

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 66c3ff7a..a2f5ce46 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -92,7 +92,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};
@@ -305,7 +307,7 @@ sub install
 	} 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) {
@@ -494,6 +496,11 @@ sub parse
 							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) {