--- trunk/lib/WebPAC/Normalize.pm	2007/04/01 21:47:42	812
+++ trunk/lib/WebPAC/Normalize.pm	2007/09/06 19:12:15	889
@@ -9,8 +9,8 @@
 
 	tag search display
 	marc marc_indicators marc_repeatable_subfield
-	marc_compose marc_leader
-	marc_duplicate marc_remove
+	marc_compose marc_leader marc_fixed
+	marc_duplicate marc_remove marc_count
 	marc_original_order
 
 	rec1 rec2 rec
@@ -42,11 +42,11 @@
 
 =head1 VERSION
 
-Version 0.26
+Version 0.29
 
 =cut
 
-our $VERSION = '0.26';
+our $VERSION = '0.29';
 
 =head1 SYNOPSIS
 
@@ -289,13 +289,15 @@
 
 =cut
 
+my $fetch_pos;
+
 sub _get_marc_fields {
 
 	my $arg = {@_};
 	warn "### _get_marc_fields arg: ", dump($arg), $/ if ($debug > 2);
-	my $offset = $marc_fetch_offset;
+	$fetch_pos = $marc_fetch_offset;
 	if ($arg->{offset}) {
-		$offset = $arg->{offset};
+		$fetch_pos = $arg->{offset};
 	} elsif($arg->{fetch_next}) {
 		$marc_fetch_offset++;
 	}
@@ -304,9 +306,9 @@
 
 	warn "### full marc_record = ", dump( @{ $marc_record }), $/ if ($debug > 2);
 
-	my $marc_rec = $marc_record->[ $offset ];
+	my $marc_rec = $marc_record->[ $fetch_pos ];
 
-	warn "## _get_marc_fields (at offset: $offset) -- marc_record = ", dump( @$marc_rec ), $/ if ($debug > 1);
+	warn "## _get_marc_fields (at offset: $fetch_pos) -- marc_record = ", dump( @$marc_rec ), $/ if ($debug > 1);
 
 	return if (! $marc_rec || ref($marc_rec) ne 'ARRAY' || $#{ $marc_rec } < 0);
 
@@ -327,7 +329,7 @@
 
 	if ($debug) {
 		warn "## marc_repeatable_subfield = ", dump( $marc_repeatable_subfield ), $/ if ( $marc_repeatable_subfield );
-		warn "## marc_record[$offset] = ", dump( $marc_rec ), $/;
+		warn "## marc_record[$fetch_pos] = ", dump( $marc_rec ), $/;
 		warn "## sorted_marc_record = ", dump( \@sorted_marc_record ), $/;
 		warn "## subfield count = ", dump( $u ), $/;
 	}
@@ -408,6 +410,19 @@
 	return \@m;
 }
 
+=head2 _get_marc_leader
+
+Return leader from currently fetched record by L</_get_marc_fields>
+
+  print WebPAC::Normalize::_get_marc_leader();
+
+=cut
+
+sub _get_marc_leader {
+	die "no fetch_pos, did you called _get_marc_fields first?" unless ( defined( $fetch_pos ) );
+	return $marc_leader->[ $fetch_pos ];
+}
+
 =head2 _debug
 
 Change level of debug warnings
@@ -490,9 +505,58 @@
 	my ($offset,$value) = @_;
 
 	if ($offset) {
-		$marc_leader->{ $offset } = $value;
+		$marc_leader->[ $marc_record_offset ]->{ $offset } = $value;
 	} else {
-		return $marc_leader;
+		
+		if (defined($marc_leader)) {
+			die "marc_leader not array = ", dump( $marc_leader ) unless (ref($marc_leader) eq 'ARRAY');
+			return $marc_leader->[ $marc_record_offset ];
+		} else {
+			return;
+		}
+	}
+}
+
+=head2 marc_fixed
+
+Create control/indentifier fields with values in fixed positions
+
+  marc_fixed('008', 00, '070402');
+  marc_fixed('008', 39, '|');
+
+Positions not specified will be filled with spaces (C<0x20>).
+
+There will be no effort to extend last specified value to full length of
+field in standard.
+
+=cut
+
+sub marc_fixed {
+	my ($f, $pos, $val) = @_;
+	die "need marc(field, position, value)" unless defined($f) && defined($pos);
+
+	confess "need val" unless defined $val;
+
+	my $update = 0;
+
+	map {
+		if ($_->[0] eq $f) {
+			my $old = $_->[1];
+			if (length($old) <= $pos) {
+				$_->[1] .= ' ' x ( $pos - length($old) ) . $val;
+				warn "## marc_fixed($f,$pos,'$val') append '$old' -> '$_->[1]'\n" if ($debug > 1);
+			} else {
+				$_->[1] = substr($old, 0, $pos) . $val . substr($old, $pos + length($val));
+				warn "## marc_fixed($f,$pos,'$val') update '$old' -> '$_->[1]'\n" if ($debug > 1);
+			}
+			$update++;
+		}
+	} @{ $marc_record->[ $marc_record_offset ] };
+
+	if (! $update) {
+		my $v = ' ' x $pos . $val;
+		push @{ $marc_record->[ $marc_record_offset ] }, [ $f, $v ];
+		warn "## marc_fixed($f,$pos,'val') created '$v'\n" if ($debug > 1);
 	}
 }
 
@@ -624,9 +688,11 @@
 	 my $m = $marc_record->[ -1 ];
 	 die "can't duplicate record which isn't defined" unless ($m);
 	 push @{ $marc_record }, dclone( $m );
-	 warn "## marc_duplicate = ", dump(@$marc_record), $/ if ($debug > 1);
+	 push @{ $marc_leader }, dclone( marc_leader() );
+	 warn "## marc_duplicate = ", dump(@$marc_leader, @$marc_record), $/ if ($debug > 1);
 	 $marc_record_offset = $#{ $marc_record };
 	 warn "## marc_record_offset = $marc_record_offset", $/ if ($debug > 1);
+
 }
 
 =head2 marc_remove
@@ -774,6 +840,18 @@
 	warn "## marc_record = ", dump( $marc_record ),$/ if ($debug > 1);
 }
 
+=head2 marc_count
+
+Return number of MARC records created using L</marc_duplicate>.
+
+  print "created ", marc_count(), " records";
+
+=cut
+
+sub marc_count {
+	return $#{ $marc_record };
+}
+
 
 =head1 Functions to extract data from input
 
@@ -796,6 +874,9 @@
 
 	my ($h,$include_subfields) = @_;
 
+	# sanity and ease of use
+	return $h if (ref($h) ne 'HASH');
+
 	if ( defined($h->{subfields}) ) {
 		my $sfs = delete $h->{subfields} || die "no subfields?";
 		my @out;
@@ -945,7 +1026,8 @@
 =cut
 
 sub prefix {
-	my $p = shift or return;
+	my $p = shift;
+	return @_ unless defined( $p );
 	return map { $p . $_ } grep { defined($_) } @_;
 }
 
@@ -958,7 +1040,8 @@
 =cut
 
 sub suffix {
-	my $s = shift or die "suffix needs string as first argument";
+	my $s = shift;
+	return @_ unless defined( $s );
 	return map { $_ . $s } grep { defined($_) } @_;
 }
 
@@ -971,8 +1054,10 @@
 =cut
 
 sub surround {
-	my $p = shift or die "surround need prefix as first argument";
-	my $s = shift or die "surround needs suffix as second argument";
+	my $p = shift;
+	my $s = shift;
+	$p = '' unless defined( $p );
+	$s = '' unless defined( $s );
 	return map { $p . $_ . $s } grep { defined($_) } @_;
 }