--- trunk/lib/WebPAC/Normalize.pm	2005/07/17 14:53:37	18
+++ trunk/lib/WebPAC/Normalize.pm	2005/07/24 15:03:11	31
@@ -2,6 +2,7 @@
 
 use warnings;
 use strict;
+use base 'WebPAC::Common';
 use Data::Dumper;
 
 =head1 NAME
@@ -78,15 +79,17 @@
 			return length($_);
 		}, ...
 	},
-	db => $webpac_db_obj,
+	db => $db_obj,
 	lookup_regex => $lookup->regex,
+	lookup => $lookup_obj,
   );
 
 Parametar C<filter> defines user supplied snippets of perl code which can
 be use with C<filter{...}> notation.
 
 Recommended parametar C<lookup_regex> is used to enable parsing of lookups
-in structures.
+in structures. If you pass this parametar, you must also pass C<lookup>
+which is C<WebPAC::Lookup> object.
 
 =cut
 
@@ -95,6 +98,19 @@
         my $self = {@_};
         bless($self, $class);
 
+	my $r = $self->{'lookup_regex'} ? 1 : 0;
+	my $l = $self->{'lookup'} ? 1 : 0;
+
+	my $log = $self->_get_logger();
+
+	# those two must be in pair
+	if ( ($r & $l) != ($r || $l) ) {
+		my $log = $self->_get_logger();
+		$log->logdie("lookup_regex and lookup must be in pair");
+	}
+
+	$log->logdie("lookup must be WebPAC::Lookup object") if ($self->{'lookup'} && ! $self->{'lookup'}->isa('WebPAC::Lookup'));
+
 	$self ? return $self : return undef;
 }
 
@@ -127,8 +143,10 @@
 	my $cache_file;
 
 	if ($self->{'db'}) {
-		my @ds = $self->{'db'}->get_ds($rec);
-		return @ds if (@ds);
+		my @ds = $self->{'db'}->load_ds($rec);
+		$log->debug("load_ds( rec = ", sub { Dumper($rec) }, ") = ", sub { Dumper(@ds) });
+		return @ds if ($#ds > 0);
+		$log->debug("cache miss, creating");
 	}
 
 	undef $self->{'currnet_filename'};
@@ -236,12 +254,14 @@
 
 	}
 
-	$self->{'db'}->put_gs(
+	$self->{'db'}->save_ds(
 		ds => \@ds,
 		current_filename => $self->{'current_filename'},
 		headline => $self->{'headline'},
 	) if ($self->{'db'});
 
+	$log->debug("ds: ", sub { Dumper(@ds) });
+
 	return @ds;
 
 }
@@ -438,7 +458,11 @@
 		}
 		# do we have lookups?
 		if ($self->{'lookup'}) {
-			return $self->lookup($format);
+			if ($self->{'lookup'}->can('lookup')) {
+				return $self->{'lookup'}->lookup($format);
+			} else {
+				$log->warn("Have lookup object but can't invoke lookup method");
+			}
 		} else {
 			return $format;
 		}
@@ -564,7 +588,7 @@
 	$log->debug("using format $name [$format] on $data to produce: $out");
 
 	if ($self->{'lookup_regex'} && $out =~ $self->{'lookup_regex'}) {
-		return $self->lookup($out);
+		return $self->{'lookup'}->lookup($out);
 	} else {
 		return $out;
 	}