--- trunk/lib/WebPAC/Lookup.pm 2005/12/15 02:03:25 250 +++ trunk/lib/WebPAC/Lookup.pm 2005/12/15 14:12:00 251 @@ -79,17 +79,18 @@ } else { $log->logide("unsupported lookup file $lookup_file"); } + $log->debug("lookup_def: " . Dumper( $self->{lookup_def} )); $log->logconfess("lookup config file isn't ARRAY but ", sub { Dumper( $self->{'lookup_def'} ) }) if ($self->{'lookup_def'} !~ /ARRAY/o); - $self->{'is_lookup_regex'} ||= 'lookup{[^\{\}]+}'; + $self->{'is_lookup_regex'} ||= 'lookup{\[[^\{\}]+\]}'; $self->{'save_lookup_regex'} ||= 'lookup{([^\{\}]+)}'; $self->{'LOOKUP_REGEX'} = qr/$self->{'is_lookup_regex'}/; $self->{'LOOKUP_REGEX_SAVE'} = qr/$self->{'save_lookup_regex'}/; - $log->debug("regexps: ", $self->{'LOOKUP_REGEX'}, " ", $self->{'LOOKUP_REGEX_SAVE'}); + $log->debug("regexps lookup:", $self->{'LOOKUP_REGEX'}, " save:", $self->{'LOOKUP_REGEX_SAVE'}); $self ? return $self : return undef; } @@ -104,7 +105,7 @@ =cut -sub add($) { +sub add { my $self = shift; my $log = $self->_get_logger(); @@ -116,8 +117,8 @@ my $n = 0; foreach my $i (@{ $self->{'lookup_def'} }) { - $log->logconfess("need key") unless defined($i->{'key'}); - $log->logconfess("need val") unless defined($i->{'val'}); + $log->logconfess("need key in ", Dumper($i) ) unless defined($i->{'key'}); + $log->logconfess("need val in ", Dumper($i) ) unless defined($i->{'val'}); $n++;