X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FFilter.pm;h=a37ea0d2d647cc95a45cdb6cdd969f8f25102e3b;hb=95a03441d20680a914673d1b6bbf46c0d673ad4c;hp=fbdb4f300fb579162fa34708504bac792f59a1a9;hpb=0e49d2c191786b825674e0cca106eef004c99899;p=spider.git

diff --git a/perl/Filter.pm b/perl/Filter.pm
index fbdb4f30..a37ea0d2 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -187,10 +187,15 @@ sub it
 	my $filter;
 	my @keys = sort $self->getfilkeys;
 	my $key;
+	my $type = 'Dunno';
+	my $asc = '?';
+	
 	my $r = @keys > 0 ? 0 : 1;
 	foreach $key (@keys) {
 		$filter = $self->{$key};
 		if ($filter->{reject} && exists $filter->{reject}->{code}) {
+			$type = 'reject';
+			$asc = $filter->{reject}->{user};
 			if (&{$filter->{reject}->{code}}(\@_)) {
 				$r = 0;
 				last;
@@ -199,6 +204,8 @@ sub it
 			}		
 		}
 		if ($filter->{accept} && exists $filter->{accept}->{code}) {
+			$type = 'accept';
+			$asc = $filter->{accept}->{user};
 			if (&{$filter->{accept}->{code}}(\@_)) {
 				$r = 1;
 				last;
@@ -211,6 +218,13 @@ sub it
 	# hops are done differently (simply) 
 	my $hops = $self->{hops} if exists $self->{hops};
 
+	if (isdbg('filter')) {
+		my $args = join '\',\'', @_;
+		my $true = $r ? "OK" : "REJ";
+		my $sort = $self->{sort};
+		$hops ||= "none";
+		dbg('filter', "Filter: $type/$sort with $asc on '$args': $true hops: $hops");
+	}
 	return ($r, $hops);
 }
 
@@ -271,7 +285,8 @@ sub install
 	my $remove = shift;
 	my $name = uc $self->{name};
 	my $sort = $self->{sort};
-	my $in = "in" if $name =~ s/^IN_//;
+	my $in = "";
+	$in = "in" if $name =~ s/^IN_//;
 	$name =~ s/.PL$//;
 		
 	my $dxchan = DXChannel->get($name);