--- trunk/lib/WebPAC/Normalize.pm	2006/01/02 10:58:26	340
+++ trunk/lib/WebPAC/Normalize.pm	2006/04/30 12:17:19	436
@@ -2,6 +2,8 @@
 
 use warnings;
 use strict;
+use blib;
+use WebPAC::Common;
 use base 'WebPAC::Common';
 use Data::Dumper;
 
@@ -11,11 +13,11 @@
 
 =head1 VERSION
 
-Version 0.08
+Version 0.09
 
 =cut
 
-our $VERSION = '0.08';
+our $VERSION = '0.09';
 
 =head1 SYNOPSIS
 
@@ -135,6 +137,37 @@
 	$self ? return $self : return undef;
 }
 
+=head2 all_tags
+
+Returns all tags in document in specified order
+
+  my $sorted_tags = $self->all_tags();
+
+=cut
+
+sub all_tags {
+	my $self = shift;
+
+	if (! $self->{_tags_by_order}) {
+
+		my $log = $self->_get_logger;
+		# sanity check
+		$log->logdie("can't find self->{inport_xml}->{indexer}") unless ($self->{import_xml}->{indexer});
+
+		my @tags = keys %{ $self->{'import_xml'}->{'indexer'}};
+		$log->debug("unsorted tags: " . join(", ", @tags));
+
+		@tags = sort { $self->_sort_by_order } @tags;
+
+		$log->debug("sorted tags: " . join(",", @tags) );
+
+		$self->{_tags_by_order} = \@tags;
+	}
+
+	return $self->{_tags_by_order};
+}
+
+
 
 =head2 data_structure
 
@@ -170,19 +203,13 @@
 		$log->debug("cache miss, creating");
 	}
 
-	my @sorted_tags;
-	if ($self->{tags_by_order}) {
-		@sorted_tags = @{$self->{tags_by_order}};
-	} else {
-		@sorted_tags = sort { $self->_sort_by_order } keys %{$self->{'import_xml'}->{'indexer'}};
-		$self->{tags_by_order} = \@sorted_tags;
-	}
+	my $tags = $self->all_tags();
 
-	my $ds;
+	$log->debug("tags: ",sub { join(", ",@{ $tags }) });
 
-	$log->debug("tags: ",sub { join(", ",@sorted_tags) });
+	my $ds;
 
-	foreach my $field (@sorted_tags) {
+	foreach my $field (@{ $tags }) {
 
 		my $row;
 
@@ -194,15 +221,18 @@
 			$log->logdie("expected tag HASH and got $tag") unless (ref($tag) eq 'HASH');
 			$format = $tag->{'value'} || $tag->{'content'};
 
-			$log->debug("format: $format");
-
 			my @v;
 			if ($self->{'lookup_regex'} && $format =~ $self->{'lookup_regex'}) {
-				@v = $self->fill_in_to_arr($rec,$format);
+				@v = $self->_rec_to_arr($rec,$format,'fill_in');
+			} else {
+				@v = $self->_rec_to_arr($rec,$format,'parse');
+			}
+			if (! @v) {
+				$log->debug("$field <",$self->{tag},"> format: $format no values");
+				next;
 			} else {
-				@v = $self->parse_to_arr($rec,$format);
+				$log->debug("$field <",$self->{tag},"> format: $format values: ", join(",", @v));
 			}
-			next if (! @v);
 
 			if ($tag->{'sort'}) {
 				@v = $self->sort_arr(@v);
@@ -225,7 +255,7 @@
 
 			foreach my $type (@types) {
 				# append to previous line?
-				$log->debug("type: $type ",sub { join(" ",@v) }, " ", $row->{'append'} || 'no append');
+				$log->debug("tag $field / $type [",sub { join(",",@v) }, "] ", $row->{'append'} || 'no append');
 				if ($tag->{'append'}) {
 
 					# I will delimit appended part with
@@ -303,7 +333,7 @@
 sub parse {
 	my $self = shift;
 
-	my ($rec, $format_utf8, $i) = @_;
+	my ($rec, $format_utf8, $i, $rec_size) = @_;
 
 	return if (! $format_utf8);
 
@@ -352,14 +382,14 @@
 		}
 
 		my $found = 0;
-		my $tmp = $self->get_data(\$rec,$3,$4,$r,\$found);
+		my $tmp = $self->get_data(\$rec,$3,$4,$r,\$found,$rec_size);
 
 		if ($found) {
 			$found_any->{$fld_type} += $found;
 
 			# we will skip delimiter before first occurence of field!
-			push @out, $del unless($found_any == 1);
-			push @out, $tmp;
+			push @out, $del unless($found_any->{$fld_type} == 1);
+			push @out, $tmp if ($tmp);
 		}
 		$f_step++;
 	}
@@ -405,37 +435,6 @@
 	return $out;
 }
 
-=head2 parse_to_arr
-
-Similar to C<parse>, but returns array of all repeatable fields
-
- my @arr = $webpac->parse_to_arr($rec,'v250^a');
-
-=cut
-
-sub parse_to_arr {
-	my $self = shift;
-
-	my ($rec, $format_utf8) = @_;
-
-	my $log = $self->_get_logger();
-
-	$log->logconfess("need HASH as first argument!") if ($rec !~ /HASH/o);
-	return if (! $format_utf8);
-
-	my $i = 0;
-	my @arr;
-
-	while (my $v = $self->parse($rec,$format_utf8,$i++)) {
-		push @arr, $v;
-	}
-
-	$log->debug("format '$format_utf8' returned ",--$i," elements: ", sub { join(" | ",@arr) }) if (@arr);
-
-	return @arr;
-}
-
-
 =head2 fill_in
 
 Workhourse of all: takes record from in-memory structure of database and
@@ -457,6 +456,11 @@
 This method will automatically decode UTF-8 string to local code page
 if needed.
 
+There is optional parametar C<$record_size> which can be used to get sizes of
+all C<field^subfield> combinations in this format.
+
+ my $text = $webpac->fill_in($rec,'got: v900^a v900^x',0,\$rec_size); 
+
 =cut
 
 sub fill_in {
@@ -464,10 +468,13 @@
 
 	my $log = $self->_get_logger();
 
-	my $rec = shift || $log->logconfess("need data record");
-	my $format = shift || $log->logconfess("need format to parse");
+	my ($rec,$format,$i,$rec_size) = @_;
+
+	$log->logconfess("need data record") unless ($rec);
+	$log->logconfess("need format to parse") unless($format);
+
 	# iteration (for repeatable fields)
-	my $i = shift || 0;
+	$i ||= 0;
 
 	$log->logdie("infitite loop in format $format") if ($i > ($self->{'max_mfn'} || 9999));
 
@@ -489,15 +496,20 @@
 	# remove filter{...} from beginning
 	$filter_name = $1 if ($format =~ s/^filter{([^}]+)}//s);
 
-	# do actual replacement of placeholders
-	# repeatable fields
-	if ($format =~ s/v(\d+)(?:\^(\w))?/$self->get_data(\$rec,$1,$2,$i,\$found)/ges) {
-		$just_single = 0;
-	}
-	
-	# non-repeatable fields
-	if ($format =~ s/s(\d+)(?:\^(\w))?/$self->get_data(\$rec,$1,$2,0,\$found)/ges) {
-		return if ($i > 0 && $just_single);
+	{
+		# fix warnings
+		no warnings 'uninitialized';
+
+		# do actual replacement of placeholders
+		# repeatable fields
+		if ($format =~ s/v(\d+)(?:\^(\w))?/$self->get_data(\$rec,$1,$2,$i,\$found,$rec_size)/ges) {
+			$just_single = 0;
+		}
+
+		# non-repeatable fields
+		if ($format =~ s/s(\d+)(?:\^(\w))?/$self->get_data(\$rec,$1,$2,0,\$found,$rec_size)/ges) {
+			return if ($i > 0 && $just_single);
+		}
 	}
 
 	if ($found) {
@@ -530,31 +542,47 @@
 }
 
 
-=head2 fill_in_to_arr
+=head2 _rec_to_arr
 
-Similar to C<fill_in>, but returns array of all repeatable fields. Usable
+Similar to C<parse> and C<fill_in>, but returns array of all repeatable fields. Usable
 for fields which have lookups, so they shouldn't be parsed but rather
-C<fill_id>ed.
+C<paste>d or C<fill_id>ed. Last argument is name of operation: C<paste> or C<fill_in>.
 
- my @arr = $webpac->fill_in_to_arr($rec,'[v900];;[v250^a]');
+ my @arr = $webpac->fill_in_to_arr($rec,'[v900];;[v250^a]','paste');
 
 =cut
 
-sub fill_in_to_arr {
+sub _rec_to_arr {
 	my $self = shift;
 
-	my ($rec, $format_utf8) = @_;
+	my ($rec, $format_utf8, $code) = @_;
 
 	my $log = $self->_get_logger();
 
 	$log->logconfess("need HASH as first argument!") if ($rec !~ /HASH/o);
 	return if (! $format_utf8);
 
+	$log->debug("using $code on $format_utf8");
+
 	my $i = 0;
+	my $max = 0;
 	my @arr;
+	my $rec_size = {};
 
-	while (my @v = $self->fill_in($rec,$format_utf8,$i++)) {
-		push @arr, @v;
+	while ($i <= $max) {
+		my @v = $self->$code($rec,$format_utf8,$i++,\$rec_size);
+		if ($rec_size) {
+			foreach my $f (keys %{ $rec_size }) {
+				$max = $rec_size->{$f} if ($rec_size->{$f} > $max);
+			}
+			$log->debug("max set to $max");
+			undef $rec_size;
+		}
+		if (@v) {
+			push @arr, @v;
+		} else {
+			push @arr, '' if ($max > $i);
+		}
 	}
 
 	$log->debug("format '$format_utf8' returned ",--$i," elements: ", sub { join(" | ",@arr) }) if (@arr);
@@ -567,50 +595,77 @@
 
 Returns value from record.
 
- my $text = $self->get_data(\$rec,$f,$sf,$i,\$found);
+ my $text = $self->get_data(\$rec,$f,$sf,$i,\$found,\$rec_size);
+
+Required arguments are:
 
-Arguments are:
-record reference C<$rec>,
-field C<$f>,
-optional subfiled C<$sf>,
-index for repeatable values C<$i>.
+=over 8
 
-Optinal variable C<$found> will be incremeted if there
-is field.
+=item C<$rec>
 
-Returns value or empty string.
+record reference
+
+=item C<$f>
+
+field
+
+=item C<$sf>
+
+optional subfield
+
+=item C<$i>
+
+index offset for repeatable values ( 0 ... $rec_size->{'400^a'} )
+
+=item C<$found>
+
+optional variable that will be incremeted if preset
+
+=item C<$rec_size>
+
+hash to hold maximum occurances of C<field^subfield> combinations
+(which can be accessed using keys in same format)
+
+=back
+
+Returns value or empty string, updates C<$found> and C<rec_size>
+if present.
 
 =cut
 
 sub get_data {
 	my $self = shift;
 
-	my ($rec,$f,$sf,$i,$found) = @_;
+	my ($rec,$f,$sf,$i,$found,$cache) = @_;
+
+	return '' unless ($$rec->{$f} && ref($$rec->{$f}) eq 'ARRAY');
+
+	if (defined($$cache)) {
+		$$cache->{ $f . ( $sf ? '^' . $sf : '' ) } ||= scalar @{ $$rec->{$f} };
+	}
+
+	return '' unless ($$rec->{$f}->[$i]);
 
-	if ($$rec->{$f}) {
-		return '' if (! $$rec->{$f}->[$i]);
+	{
 		no strict 'refs';
-		if ($sf && $$rec->{$f}->[$i]->{$sf}) {
-			$$found++ if (defined($$found));
+		if (defined($sf)) {
+			$$found++ if (defined($$found) && $$rec->{$f}->[$i]->{$sf});
 			return $$rec->{$f}->[$i]->{$sf};
-		} elsif (! $sf && $$rec->{$f}->[$i]) {
+		} else {
 			$$found++ if (defined($$found));
-			# it still might have subfield, just
-			# not specified, so we'll dump all
+			# it still might have subfields, just
+			# not specified, so we'll dump some debug info
 			if ($$rec->{$f}->[$i] =~ /HASH/o) {
 				my $out;
 				foreach my $k (keys %{$$rec->{$f}->[$i]}) {
-					$out .= $$rec->{$f}->[$i]->{$k}." ";
+					my $v = $$rec->{$f}->[$i]->{$k};
+					$out .= '$' . $k .':' . $v if ($v);
 				}
 				return $out;
 			} else {
 				return $$rec->{$f}->[$i];
 			}
-		} else {
-			return '';
 		}
-	} else {
-		return '';
 	}
 }