--- trunk/filter/mem_lookup.pm	2004/01/18 21:11:39	205
+++ trunk/filter/mem_lookup.pm	2004/06/15 22:14:41	351
@@ -31,41 +31,37 @@
 			# store in array if it doesn't exist
 			if (! grep(/^$v$/, @{$main::cache->{mem_lookup}->{$k}})) {
 				push @{$main::cache->{mem_lookup}->{$k}}, $v;
-#print STDERR "## mem_lookup store: $k => $v\n";
+#print STDERR "## mem_lookup store: $k => $v [",join("|",@{$main::cache->{mem_lookup}->{$k}}),"]\n";
 			}
-		} elsif (/^(.*)\[([^\[]*)\[([^\[\]]+)\]([^\]]*)\](.*)$/) {
-			# indirect lookup [prefix[key]suffix]
-			my ($pre,$prek,$k,$postk,$post) = ($1,$2,$3,$4,$5);
-			if ($main::cache->{mem_lookup}->{$k}) {
-				my @keys = @{$main::cache->{mem_lookup}->{$k}};
-#print STDERR "## mem_lookup fetch keys $k == ".join("|",@keys)."\n";
-				foreach my $k2 (@keys) {
-					if ($main::cache->{mem_lookup}->{$prek.$k2.$postk}) {
-						foreach my $v (@{$main::cache->{mem_lookup}->{$prek.$k2.$postk}}) {
-							push @out,$pre.$v.$post;
+		} elsif (/\[[^\[\]]+\]/) {
+			# lookup [key] recursivly
+			my @in = ( $_ );
+#print STDERR "mem_lookup: $_\n";
+			while (my $f = shift @in) {
+				if ($f =~ /\[([^\[\]]+)\]/) {
+					my $k = $1;
+					if ($main::cache->{mem_lookup}->{$k}) {
+#print STDERR "mem_lookup key: $k = ";
+						foreach my $nv (@{$main::cache->{mem_lookup}->{$k}}) {
+#print STDERR "\t$nv\n";
+							my $tmp = $f;
+							$tmp =~ s/\[$k\]/$nv/g;
+							push @in, $tmp;
 						}
+					} else {
+						undef $f;
 					}
-				}
-#print STDERR "## mem_lookup return values $k == ".join("|",@out)."\n";
-
-			}
-		} elsif (/^(.*)\[([^\[\]]+)\](.*)$/) {
-			# direct lookup [key]
-			my ($pre,$k,$post) = ($1,$2,$3);
-			if ($main::cache->{mem_lookup}->{$k}) {
-#print STDERR "## mem_lookup fetch $k == ".join("|",@{$main::cache->{mem_lookup}->{$k}})."\n";
-				foreach my $v (@{$main::cache->{mem_lookup}->{$k2}}) {
-					push @out,$pre.$v.$post;
-				}
+				} elsif ($f) {
+					push @out, $f;
+				}	
 			}
-#print STDERR "## mem_lookup return values $k == ".join("|",@out)."\n";
-
 		} else {
 			# value is undef
 			#warn "mem_lookup: invalid filter specification: '$_'";
 		}
 	}
 #print STDERR "mem_lookup dump: ",Dumper($main::cache->{mem_lookup}),"\n";
+#print STDERR "out: ".Dumper(@out)."\n" if (@out);
 	return @out;
 }