--- trunk/lib/WebPAC/Common.pm	2005/07/16 14:44:38	6
+++ trunk/lib/WebPAC/Common.pm	2005/07/16 16:00:19	7
@@ -17,11 +17,6 @@
 
 our $VERSION = '0.01';
 
-#my $LOOKUP_REGEX = '\[[^\[\]]+\]';
-#my $LOOKUP_REGEX_SAVE = '\[([^\[\]]+)\]';
-my $LOOKUP_REGEX = 'lookup{[^\{\}]+}';
-my $LOOKUP_REGEX_SAVE = 'lookup{([^\{\}]+)}';
-
 =head1 SYNOPSYS
 
 This module defines common functions, and is used as base for other, more
@@ -109,8 +104,7 @@
 			$log->debug("filter result: $format");
 		}
 		# do we have lookups?
-		if ($format =~ /$LOOKUP_REGEX/o) {
-			$log->debug("format '$format' has lookup");
+		if ($self->{'lookup'}) {
 			return $self->lookup($format);
 		} else {
 			return $format;