X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FFilter.pm;h=b027041c8c664711a0faaf511259bbcb147653c8;hb=6ccc3a6e864a2fee18786a7070400c7c4f22cf7c;hp=031ec92669a6cd200729d40ddef70d9e58d92e15;hpb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;p=spider.git

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 031ec926..b027041c 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -30,9 +30,16 @@ use DXVars;
 use DXUtil;
 use DXDebug;
 use Data::Dumper;
+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;
+
 use vars qw ($filterbasefn $in);
 
 $filterbasefn = "$main::root/filter";
@@ -189,7 +196,7 @@ sub it
 	my $key;
 	my $type = 'Dunno';
 	my $asc = '?';
-	
+
 	my $r = @keys > 0 ? 0 : 1;
 	foreach $key (@keys) {
 		$filter = $self->{$key};
@@ -291,10 +298,22 @@ sub install
 	$in = "in" if $name =~ s/^IN_//;
 	$name =~ s/.PL$//;
 		
-	my $dxchan = DXChannel->get($name);
-	if ($dxchan) {
+	my $dxchan;
+	my @dxchan;
+	if ($name eq 'NODE_DEFAULT') {
+		@dxchan = DXChannel::get_all_nodes();
+	} elsif ($name eq 'USER_DEFAULT') {
+		@dxchan = DXChannel::get_all_users();
+	} else {
+		$dxchan = DXChannel->get($name);
+		push @dxchan, $dxchan if $dxchan;
+	}
+	foreach $dxchan (@dxchan) {
 		my $n = "$in$sort" . "filter";
-		$dxchan->$n($remove ? undef : $self);
+		my $ref = $dxchan->$n;
+		if (!$ref || ($ref && uc $ref->{name} eq "$name.PL")) {
+			$dxchan->$n($remove ? undef : $self);
+		}
 	}
 }
 
@@ -465,6 +484,25 @@ sub parse
 								push @t, "\$r->[$fref->[2]]==$_";
 							}
 							$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) . ")";
 						} elsif ($fref->[1] eq 'r') {
 							my @t;
 							for (@val) {
@@ -511,7 +549,9 @@ sub cmd
 	return $dxchan->msg('filter5') unless $line;
 
 	my ($r, $filter, $fno, $user, $s) = $self->parse($dxchan, $sort, $line);
-	return (1,$filter) if $r;
+	my $u = DXUser->get_current($user);
+	return (1, $dxchan->msg('isow', $user)) if $u && $u->isolate;
+	return (1, $filter) if $r;
 
 	my $fn = "filter$fno";