--- trunk/lib/WebPAC/Normalize.pm	2005/12/16 14:40:55	260
+++ trunk/lib/WebPAC/Normalize.pm	2005/12/23 21:37:05	317
@@ -11,11 +11,11 @@
 
 =head1 VERSION
 
-Version 0.06
+Version 0.08
 
 =cut
 
-our $VERSION = '0.06';
+our $VERSION = '0.08';
 
 =head1 SYNOPSIS
 
@@ -123,7 +123,7 @@
 
 	$log->debug("using lookup regex: ", $self->{lookup_regex}) if ($r && $l);
 
-	if ($self->{filter} && ! $self->{filter}->{regex}) {
+	if (! $self->{filter} || ! $self->{filter}->{regex}) {
 		$log->debug("adding built-in filter regex");
 		$self->{filter}->{regex} = sub {
 			my ($val, $regex) = @_;
@@ -157,7 +157,7 @@
 
 	$log->debug("data_structure rec = ", sub { Dumper($rec) });
 
-	$log->logdie("need unique ID (mfn) in field 000 of record ", sub { Dumper($rec) } ) unless (defined($rec->{'000'}));
+	$log->logdie("need unique ID (mfn) in field 000 of record " . Dumper($rec) ) unless (defined($rec->{'000'}));
 
 	my $id = $rec->{'000'}->[0] || $log->logdie("field 000 isn't array!");
 
@@ -170,9 +170,6 @@
 		$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}};
@@ -301,6 +298,8 @@
 
 =cut
 
+my $warn_once;
+
 sub parse {
 	my $self = shift;
 
@@ -328,13 +327,17 @@
 	# remove filter{...} from beginning
 	$filter_name = $1 if ($format =~ s/^filter{([^}]+)}//s);
 
+	# did we found any (att all) field from format in row?
+	my $found_any = 0;
+	# prefix before first field which we preserve it $found_any
 	my $prefix;
-	my $all_found=0;
+
+	my $f_step = 1;
 
 	while ($format =~ s/^(.*?)(v|s)(\d+)(?:\^(\w))?//s) {
 
 		my $del = $1 || '';
-		$prefix ||= $del if ($all_found == 0);
+		$prefix = $del if ($f_step == 1);
 
 		# repeatable index
 		my $r = $i;
@@ -344,13 +347,16 @@
 		my $tmp = $self->get_data(\$rec,$3,$4,$r,\$found);
 
 		if ($found) {
-			push @out, $del;
+			$found_any += $found;
+
+			# we will skip delimiter before first occurence of field!
+			push @out, $del unless($found_any == 1);
 			push @out, $tmp;
-			$all_found += $found;
 		}
+		$f_step++;
 	}
 
-	return if (! $all_found);
+	return if (! $found_any);
 
 	my $out = join('',@out);
 
@@ -381,8 +387,9 @@
 			$out = $self->{'filter'}->{$filter_name}->(@filter_args);
 			return unless(defined($out));
 			$log->debug("filter result: $out");
-		} else {
+		} elsif (! $warn_once->{$filter_name}) {
 			$log->warn("trying to use undefined filter $filter_name");
+			$warn_once->{$filter_name}++;
 		}
 	}