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

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 66c3ff7a..2403ace8 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -36,7 +36,7 @@ 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,0));
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/,(0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -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};
@@ -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) {