--- trunk/lib/WebPAC/Normalize.pm	2005/12/05 17:46:57	209
+++ trunk/lib/WebPAC/Normalize.pm	2005/12/16 21:09:42	268
@@ -11,11 +11,11 @@
 
 =head1 VERSION
 
-Version 0.02
+Version 0.06
 
 =cut
 
-our $VERSION = '0.02';
+our $VERSION = '0.06';
 
 =head1 SYNOPSIS
 
@@ -47,6 +47,10 @@
 code defined as code ref on format after field substitution to producing
 output
 
+There is one built-in filter called C<regex> which can be use like this:
+
+  filter{regex(s/foo/bar/)}
+
 =item *
 
 optional C<lookup{...}> will be then performed. See C<WebPAC::Lookups>.
@@ -82,11 +86,15 @@
 	db => $db_obj,
 	lookup_regex => $lookup->regex,
 	lookup => $lookup_obj,
+	prefix => 'foobar',
   );
 
 Parametar C<filter> defines user supplied snippets of perl code which can
 be use with C<filter{...}> notation.
 
+C<prefix> is used to form filename for database record (to support multiple
+source files which are joined in one database).
+
 Recommended parametar C<lookup_regex> is used to enable parsing of lookups
 in structures. If you pass this parametar, you must also pass C<lookup>
 which is C<WebPAC::Lookup> object.
@@ -111,6 +119,19 @@
 
 	$log->logdie("lookup must be WebPAC::Lookup object") if ($self->{'lookup'} && ! $self->{'lookup'}->isa('WebPAC::Lookup'));
 
+	$log->warn("no prefix defined. please check that!") unless ($self->{'prefix'});
+
+	$log->debug("using lookup regex: ", $self->{lookup_regex}) if ($r && $l);
+
+	if ($self->{filter} && ! $self->{filter}->{regex}) {
+		$log->debug("adding built-in filter regex");
+		$self->{filter}->{regex} = sub {
+			my ($val, $regex) = @_;
+			eval "\$val =~ $regex";
+			return $val;
+		};
+	}
+
 	$self ? return $self : return undef;
 }
 
@@ -138,20 +159,17 @@
 
 	$log->logdie("need unique ID (mfn) in field 000 of record ", sub { Dumper($rec) } ) unless (defined($rec->{'000'}));
 
-	my $mfn = $rec->{'000'}->[0] || $log->logdie("field 000 isn't array!");
+	my $id = $rec->{'000'}->[0] || $log->logdie("field 000 isn't array!");
 
 	my $cache_file;
 
 	if ($self->{'db'}) {
-		my $ds = $self->{'db'}->load_ds( $mfn );
+		my $ds = $self->{'db'}->load_ds( id => $id, prefix => $self->{prefix} );
 		$log->debug("load_ds( rec = ", sub { Dumper($rec) }, ") = ", sub { Dumper($ds) });
 		return $ds if ($ds);
 		$log->debug("cache miss, creating");
 	}
 
-	undef $self->{'currnet_filename'};
-	undef $self->{'headline'};
-
 	my @sorted_tags;
 	if ($self->{tags_by_order}) {
 		@sorted_tags = @{$self->{tags_by_order}};
@@ -207,7 +225,7 @@
 
 			foreach my $type (@types) {
 				# append to previous line?
-				$log->debug("type: $type ",sub { join(" ",@v) }, $row->{'append'} || 'no append');
+				$log->debug("type: $type ",sub { join(" ",@v) }, " ", $row->{'append'} || 'no append');
 				if ($tag->{'append'}) {
 
 					# I will delimit appended part with
@@ -249,8 +267,9 @@
 	}
 
 	$self->{'db'}->save_ds(
-		id => $mfn,
+		id => $id,
 		ds => $ds,
+		prefix => $self->{prefix},
 	) if ($self->{'db'});
 
 	$log->debug("ds: ", sub { Dumper($ds) });
@@ -269,8 +288,18 @@
 
  my $text = $webpac->parse($rec,'eval{"v901^a" eq "Deskriptor"}descriptor: v250^a', $i);
 
+Filters are implemented here. While simple form of filters looks like this:
+
+  filter{name_of_filter}
+
+but, filters can also have variable number of parametars like this:
+
+  filter{name_of_filter(param,param,param)}
+
 =cut
 
+my $warn_once;
+
 sub parse {
 	my $self = shift;
 
@@ -340,11 +369,21 @@
 		return if (! $self->_eval($eval));
 	}
 	
-	if ($filter_name && $self->{'filter'}->{$filter_name}) {
-		$log->debug("about to filter{$filter_name} format: $out");
-		$out = $self->{'filter'}->{$filter_name}->($out);
-		return unless(defined($out));
-		$log->debug("filter result: $out");
+	if ($filter_name) {
+		my @filter_args;
+		if ($filter_name =~ s/(\w+)\((.*)\)/$1/) {
+			@filter_args = split(/,/, $2);
+		}
+		if ($self->{'filter'}->{$filter_name}) {
+			$log->debug("about to filter{$filter_name} format: $out with arguments: ", join(",", @filter_args));
+			unshift @filter_args, $out;
+			$out = $self->{'filter'}->{$filter_name}->(@filter_args);
+			return unless(defined($out));
+			$log->debug("filter result: $out");
+		} elsif (! $warn_once->{$filter_name}) {
+			$log->warn("trying to use undefined filter $filter_name");
+			$warn_once->{$filter_name}++;
+		}
 	}
 
 	return $out;
@@ -454,7 +493,9 @@
 		# do we have lookups?
 		if ($self->{'lookup'}) {
 			if ($self->{'lookup'}->can('lookup')) {
-				return $self->{'lookup'}->lookup($format);
+				my @lookup = $self->{lookup}->lookup($format);
+				$log->debug("lookup $format", join(", ", @lookup));
+				return @lookup;
 			} else {
 				$log->warn("Have lookup object but can't invoke lookup method");
 			}