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

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 8acce7f3..fbdb4f30 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -184,8 +184,6 @@ sub it
 {
 	my $self = shift;
 	
-	my $hops = undef;
-		
 	my $filter;
 	my @keys = sort $self->getfilkeys;
 	my $key;
@@ -210,17 +208,9 @@ sub it
 		} 
 	}
 
-	# hops are done differently 
-	if ($self->{hops}) {
-		my ($comp, $ref);
-		while (($comp, $ref) = each %{$self->{hops}}) {
-			my ($field, $h) = @$ref;
-			if ($_[$field] =~ m{$comp}) {
-				$hops = $h;
-				last;
-			} 
-		}		
-	}
+	# hops are done differently (simply) 
+	my $hops = $self->{hops} if exists $self->{hops};
+
 	return ($r, $hops);
 }
 
@@ -281,12 +271,11 @@ sub install
 	my $remove = shift;
 	my $name = uc $self->{name};
 	my $sort = $self->{sort};
-	my ($in) = $name =~ s/^IN_//;
+	my $in = "in" if $name =~ s/^IN_//;
 	$name =~ s/.PL$//;
 		
 	my $dxchan = DXChannel->get($name);
 	if ($dxchan) {
-		$in = lc $in if $in;
 		my $n = "$in$sort" . "filter";
 		$dxchan->$n($remove ? undef : $self);
 	}
@@ -369,7 +358,7 @@ sub parse
 			}
 
 			$filter = Filter::read_in($sort, $call, $flag);
-			$filter = Filter->new($sort, $call, $flag) unless $filter;
+			$filter = Filter->new($sort, $call, $flag) if !$filter || $filter->isa('Filter::Old');
 			
 			$ntoken++;
 			next;
@@ -466,6 +455,13 @@ sub parse
 								push @t, "(\$r->[$fref->[2]]>=$1 && \$r->[$fref->[2]]<=$2)";
 							}
 							$s .= "(" . join(' || ', @t) . ")";
+						} elsif ($fref->[1] eq 't') {
+							my @t;
+							for (@val) {
+								s/\*//g;
+								push @t, "\$r->[$fref->[2]]=~/$_/i";
+							}
+							$s .= "(" . join(' || ', @t) . ")";
 						} else {
 							confess("invalid letter $fref->[1]");
 						}