add 't' action to filter.pm

diff --git a/Changes b/Changes
index e15e223329cbd5bba605cc29cbb5b754b63a0e61..1162d9d1cf3e6ae56212644ccd1496ac89dbaa49 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+12Nov00=======================================================================
+1. Fix lack 't' action in Filter.pm
 08Nov00=======================================================================
 1. fix cosmetic errors in for/oper for 'users'.
 07Nov00=======================================================================

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 75ae1befe21a75d4ba4f48fbcaf61c284f1ae0eb..dce9c04f28f0b8df2b902ece0ba6c12d145968a9 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -636,7 +636,7 @@ sub queue_msg
                # guess, use (to, from, time, subject) tuple?
                foreach $dxchan (@nodelist) {
                        next if $dxchan->call eq $main::mycall;
-                       next if grep { $_ eq $dxchan->call } @{$ref->{gotit}};
+                       next if ref $ref->{gotit} && grep $_ eq $dxchan->call, @{$ref->{gotit}};
                        next unless $ref->forward_it($dxchan->call);           # check the forwarding file
 
                        # if we are here we have a node that doesn't have this message

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 59ace8af8edb2986827d2258760644eac290ee02..b927dc1f0700c0917e9bccbc61f0f345123c2c54 100644 (file)
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -456,6 +456,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]");
                                                }