X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=9c7064d21cdfd3a0d943eb970b3a0bdf87423ab0;hb=211b54d504170a8c9dad2bf25b9ed686d5eeac11;hp=5d2b10b8e38543bce9d20964f09f769152e18aca;hpb=15a742ea0f1983282fdff272a362555afbdb99ad;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 5d2b10b8..9c7064d2 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -70,7 +70,7 @@ $baddxfn = "$main::data/baddx.pl";
  [ qw(c c n n) ],				# pc25
  [ qw(f m d t m c c bc) ],		# pc26
  [ qw(d n n n n m c c bc) ],	# pc27
- [ qw(c c c c d t p m bp n p bp bc) ], # pc28
+ [ qw(c c c m d t p m bp n p bp bc) ], # pc28
  [ qw(c c n m) ],				# pc29
  [ qw(c c n) ],					# pc30
  [ qw(c c n) ],					# pc31
@@ -212,14 +212,14 @@ sub start
 	$self->{here} = 1;
 
 	# get the output filters
-	$self->{spotfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
+	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
 	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
 	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'node_default', 0);
 	$self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'node_default', 0) ;
 
 
 	# get the INPUT filters (these only pertain to Clusters)
-	$self->{inspotfilter} = Filter::read_in('spots', $call, 1) || Filter::read_in('spots', 'node_default', 1);
+	$self->{inspotsfilter} = Filter::read_in('spots', $call, 1) || Filter::read_in('spots', 'node_default', 1);
 	$self->{inwwvfilter} = Filter::read_in('wwv', $call, 1) || Filter::read_in('wwv', 'node_default', 1);
 	$self->{inwcyfilter} = Filter::read_in('wcy', $call, 1) || Filter::read_in('wcy', 'node_default', 1);
 	$self->{inannfilter} = Filter::read_in('ann', $call, 1) || Filter::read_in('ann', 'node_default', 1);
@@ -466,7 +466,7 @@ sub normal
 						$org_itu = $dxcc[1]->itu;
 						$org_cq = $dxcc[1]->cq();						
 					}
-					my ($filter, $hops) = Filter::it($self->{inannfilter}, @field[1..6], $self->{call}, 
+					my ($filter, $hops) = $self->{inannfilter}->it(@field[1..6], $self->{call}, 
 													$ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 					unless ($filter) {
 						dbg('chan', "Rejected by filter");
@@ -1138,8 +1138,8 @@ sub send_dx_spot
 		my $routeit;
 		my ($filter, $hops);
 
-		if ($dxchan->{spotfilter}) {
-		    ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} );
+		if ($dxchan->{spotsfilter}) {
+		    ($filter, $hops) = $dxchan->{spotsfilter}->it(@_, $self->{call} );
 			next unless $filter;
 		}
 		
@@ -1184,7 +1184,7 @@ sub send_wwv_spot
 		my ($filter, $hops);
 
 		if ($dxchan->{wwvfilter}) {
-			 ($filter, $hops) = Filter::it($dxchan->{wwvfilter}, @_, $self->{call} );
+			 ($filter, $hops) = $dxchan->{wwvfilter}->it(@_, $self->{call} );
 			 next unless $filter;
 		}
 		if ($dxchan->is_node) {
@@ -1228,7 +1228,7 @@ sub send_wcy_spot
 		my ($filter, $hops);
 
 		if ($dxchan->{wcyfilter}) {
-			 ($filter, $hops) = Filter::it($dxchan->{wcyfilter}, @_, $self->{call} );
+			 ($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call} );
 			 next unless $filter;
 		}
 		if ($dxchan->is_clx || $dxchan->is_spider) {
@@ -1303,7 +1303,7 @@ sub send_announce
 				$org_itu = $dxcc[1]->itu;
 				$org_cq = $dxcc[1]->cq;						
 			}
-			($filter, $hops) = Filter::it($dxchan->{annfilter}, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
+			($filter, $hops) = $dxchan->{annfilter}->it(@_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 			next unless $filter;
 		} 
 		if ($dxchan->is_node && $_[1] ne $main::mycall) {  # i.e not specifically routed to me
@@ -1473,7 +1473,7 @@ sub broadcast_list
 		
 		if ($sort eq 'dx') {
 		    next unless $dxchan->{dx};
-			($filter) = Filter::it($dxchan->{spotfilter}, @{$fref}) if ref $fref;
+			($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
 			next unless $filter;
 		}
 		next if $sort eq 'ann' && !$dxchan->{ann};