X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FFilter.pm;h=6b5cad94e5b682ed504d1f03e9568a90751c62fb;hb=refs%2Fheads%2Fnewdisc;hp=7879291968fd13fe1d154abd088c7a22a72a2718;hpb=7b9256ceade8b18b48f848c9ac659c2de7322b0b;p=spider.git

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 78792919..6b5cad94 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -10,7 +10,7 @@
 #
 # Copyright (c) 1999 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 # The NEW INSTRUCTIONS
 #
@@ -373,7 +373,7 @@ sub parse
 	my $user;
 	
 	# check the line for non legal characters
-	return ('ill', $dxchan->msg('e19')) if $line =~ /[^\s\w,_\-\*\/\(\)!]/;
+	return ('ill', $dxchan->msg('e19')) if $line !~ /{.*}/ && $line =~ /[^\s\w,_\-\*\/\(\)!]/;
 	
 	# add some spaces for ease of parsing
 	$line =~ s/([\(\)])/ $1 /g;
@@ -385,7 +385,7 @@ sub parse
 	while (@f) {
 		if ($ntoken == 0) {
 			
-			if (@f && $dxchan->priv >= 8 && ((is_callsign(uc $f[0]) && DXUser->get(uc $f[0])) || $f[0] =~ /(?:node|user)_default/)) {
+			if (@f && $dxchan->priv >= 8 && ((is_callsign(uc $f[0]) && DXUser::get(uc $f[0])) || $f[0] =~ /(?:node|user)_default/)) {
 				$call = shift @f;
 				if ($f[0] eq 'input') {
 					shift @f;
@@ -473,18 +473,23 @@ sub parse
 							}
 							@val = @nval;
 						}
-						if ($fref->[1] eq 'a') {
+						if ($fref->[1] eq 'a' || $fref->[1] eq 't') {
 							my @t;
 							for (@val) {
-								s/\*//g;
-								push @t, "\$r->[$fref->[2]]=~/$_/i";
+								s/\*//g;        # remove any trailing *
+								if (/^\{.*\}$/) { # we have a regex 
+									s/^\{//;
+								    s/\}$//;
+									return  ('regex', $dxchan->msg('e38', $_)) unless (qr{$_})
+								}
+								push @t, "\$r->[$fref->[2]]=~m{$_}i";
 							}
 							$s .= "(" . join(' || ', @t) . ")";
 						} elsif ($fref->[1] eq 'c') {
 							my @t;
 							for (@val) {
 								s/\*//g;
-								push @t, "\$r->[$fref->[2]]=~/^\U$_/";
+								push @t, "\$r->[$fref->[2]]=~m{^\U$_}";
 							}
 							$s .= "(" . join(' || ', @t) . ")";
 						} elsif ($fref->[1] eq 'n') {
@@ -511,15 +516,8 @@ 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]");
+							confess("invalid filter function $fref->[1]");
 						}
 						++$found;
 						last;
@@ -550,7 +548,7 @@ sub cmd
 	return $dxchan->msg('filter5') unless $line;
 
 	my ($r, $filter, $fno, $user, $s) = $self->parse($dxchan, $sort, $line);
-	my $u = DXUser->get_current($user);
+	my $u = DXUser::get_current($user);
 	return (1, $dxchan->msg('isow', $user)) if $u && $u->isolate;
 	return (1, $filter) if $r;
 
@@ -597,8 +595,11 @@ use vars qw(@ISA);
 # to 'Filter::it' 
 #
 # The fieldsort is the type of field that we are dealing with which 
-# currently can be 'a', 'n', 'r' or 'd'. 'a' is alphanumeric, 'n' is 
-# numeric, 'r' is ranges of pairs of numeric values and 'd' is default.
+# currently can be 'a', 'n', 'r' or 'd'.
+#    'a' is alphanumeric
+#    'n' is# numeric
+#    'r' is ranges of pairs of numeric values
+#    'd' is default (effectively, don't filter)
 #
 # Filter::it basically goes thru the list of comparisons from top to
 # bottom and when one matches it will return the action and the action data as a list. 
@@ -637,9 +638,9 @@ sub it
 				return ($action, $actiondata)  if $val >= $range[$i] && $val <= $range[$i+1];
 			}
 		} elsif ($fieldsort eq 'a') {
-			return ($action, $actiondata)  if $_[$field] =~ m{$comp};
+			return ($action, $actiondata)  if $_[$field] =~ m{$comp}i;
 		} else {
-			return ($action, $actiondata);      # the default action
+			return ($action, $actiondata);      # the default action (just pass through)
 		}
 	}
 }