X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FFilter.pm;h=82130b932041f35a8f2039fb0d433bdf7e96f29a;hb=57f8bfa8204fa6af0d4ed605ee694e6c6ebff40a;hp=9b1b1d50196fdf84cf870185a2954f46f5aba3f3;hpb=82236b001650f0e9770d25566a033501ec4fb6f4;p=spider.git

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 9b1b1d50..82130b93 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -89,7 +89,7 @@ sub compile
 		if ($@) {
 			my $sort = $ref->{sort};
 			my $name = $ref->{name};
-			dbg('err', "Error compiling $ar $sort $name: $@");
+			dbg("Error compiling $ar $sort $name: $@");
 			Log('err', "Error compiling $ar $sort $name: $@");
 		}
 		$rr = $@;
@@ -107,7 +107,7 @@ sub read_in
 		$in = undef; 
 		my $s = readfilestr($fn);
 		my $newin = eval $s;
-		dbg('conn', "$@") if $@;
+		dbg($@) if $@;
 		if ($in) {
 			$newin = new('Filter::Old', $sort, $call, $flag);
 			$newin->{filter} = $in;
@@ -216,14 +216,16 @@ sub it
 	}
 
 	# hops are done differently (simply) 
-	my $hops = $self->{hops} if exists $self->{hops};
+	my $hops = "H$self->{hops}" if exists $self->{hops};
 
 	if (isdbg('filter')) {
 		my $args = join '\',\'', @_;
-		my $true = $r ? "OK" : "REJ";
+		my $true = $r ? "OK " : "REJ";
 		my $sort = $self->{sort};
-		$hops ||= "none";
-		dbg('filter', "Filter: $type/$sort with $asc on '$args': $true hops: $hops");
+		my $dir = $self->{name} =~ /^in_/i ? "IN " : "OUT";
+		
+		$hops ||= "H?";
+		dbg("$true $dir: $type/$sort with $asc on '$args' $hops") if isdbg('filter');
 	}
 	return ($r, $hops);
 }
@@ -285,7 +287,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);