X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FFilter.pm;h=66c3ff7acb2aceb64b1a1ec1265c2cda8d94bcf3;hb=5b9ab81174d4a7734c92af52da6ddf89e980e321;hp=bf7ff65c18a24c82df8eb4c45e7c7e7695b2e04d;hpb=f526fba8b99f487581a3048d4c0f2cd2d3c1d7c9;p=spider.git

diff --git a/perl/Filter.pm b/perl/Filter.pm
index bf7ff65c..66c3ff7a 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -490,24 +490,10 @@ 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] eq 'r') {
 							my @t;
 							for (@val) {