--- trunk/lib/WebPAC/Normalize.pm	2006/07/02 20:33:13	565
+++ trunk/lib/WebPAC/Normalize.pm	2006/07/06 10:31:13	586
@@ -8,6 +8,7 @@
 	tag search display
 	marc marc_indicators marc_repeatable_subfield
 	marc_compose marc_leader
+	marc_duplicate marc_remove
 
 	rec1 rec2 rec
 	regex prefix suffix surround
@@ -22,6 +23,7 @@
 #use base qw/WebPAC::Common/;
 use Data::Dump qw/dump/;
 use Encode qw/from_to/;
+use Storable qw/dclone/;
 
 # debugging warn(s)
 my $debug = 0;
@@ -33,11 +35,11 @@
 
 =head1 VERSION
 
-Version 0.09
+Version 0.11
 
 =cut
 
-our $VERSION = '0.09';
+our $VERSION = '0.11';
 
 =head1 SYNOPSIS
 
@@ -117,7 +119,8 @@
 
 =cut
 
-my ($out,$marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators);
+my ($out, $marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators);
+my ($marc_record_offset, $marc_fetch_offset) = (0, 0);
 
 sub _get_ds {
 	return $out;
@@ -134,6 +137,7 @@
 sub _clean_ds {
 	my $a = {@_};
 	($out,$marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators) = ();
+	($marc_record_offset, $marc_fetch_offset) = (0,0);
 	$marc_encoding = $a->{marc_encoding};
 }
 
@@ -182,34 +186,71 @@
 which might not be what you have in mind. If you need repeatable subfield,
 define it using C<marc_repeatable_subfield> like this:
 
-....
+  marc_repeatable_subfield('900','a');
+  marc('900','a', rec('200','a') );
+  marc('900','b', rec('200','b') );
+  marc('900','c', rec('200','c') );
+
+will create:
+
+  900a-1 900a-2 900a-3 900b-1 900c-1
+  900b-2
+
+There is also support for returning next or specific using:
+
+  while (my $mf = WebPAC::Normalize:_get_marc_fields( fetch_next => 1 ) ) {
+  	# do something with $mf
+  }
+
+will always return fields from next MARC record or
+
+  my $mf = WebPAC::Normalize::_get_marc_fields( offset => 42 );
+
+will return 42th copy record (if it exists).
 
 =cut
 
 sub _get_marc_fields {
 
-	return if (! $marc_record || ref($marc_record) ne 'ARRAY' || $#{ $marc_record } < 0);
+	my $arg = {@_};
+	warn "### _get_marc_fields arg: ", dump($arg), $/ if ($debug > 2);
+	my $offset = $marc_fetch_offset;
+	if ($arg->{offset}) {
+		$offset = $arg->{offset};
+	} elsif($arg->{fetch_next}) {
+		$marc_fetch_offset++;
+	}
+
+	return if (! $marc_record || ref($marc_record) ne 'ARRAY');
+
+	warn "### full marc_record = ", dump( @{ $marc_record }), $/ if ($debug > 2);
+
+	my $marc_rec = $marc_record->[ $offset ];
+
+	warn "## _get_marc_fields (at offset: $offset) -- marc_record = ", dump( @$marc_rec ), $/ if ($debug > 1);
+
+	return if (! $marc_rec || ref($marc_rec) ne 'ARRAY' || $#{ $marc_rec } < 0);
 
 	# first, sort all existing fields 
 	# XXX might not be needed, but modern perl might randomize elements in hash
 	my @sorted_marc_record = sort {
-		$a->[0] . $a->[3] cmp $b->[0] . $b->[3]	
-	} @{ $marc_record };
+		$a->[0] . ( $a->[3] || '' ) cmp $b->[0] . ( $b->[3] || '')
+	} @{ $marc_rec };
 
-	@sorted_marc_record = @{ $marc_record };	### FIXME disable sorting
+	@sorted_marc_record = @{ $marc_rec };	### FIXME disable sorting
 	
 	# output marc fields
 	my @m;
 
 	# count unique field-subfields (used for offset when walking to next subfield)
 	my $u;
-	map { $u->{ $_->[0] . $_->[3]  }++ } @sorted_marc_record;
+	map { $u->{ $_->[0] . ( $_->[3] || '')  }++ } @sorted_marc_record;
 
 	if ($debug) {
-		warn "## marc_repeatable_subfield ", dump( $marc_repeatable_subfield ), $/;
-		warn "## marc_record ", dump( $marc_record ), $/;
-		warn "## sorted_marc_record ", dump( \@sorted_marc_record ), $/;
-		warn "## subfield count ", dump( $u ), $/;
+		warn "## marc_repeatable_subfield = ", dump( $marc_repeatable_subfield ), $/ if ( $marc_repeatable_subfield );
+		warn "## marc_record[$offset] = ", dump( $marc_rec ), $/;
+		warn "## sorted_marc_record = ", dump( \@sorted_marc_record ), $/;
+		warn "## subfield count = ", dump( $u ), $/;
 	}
 
 	my $len = $#sorted_marc_record;
@@ -227,11 +268,11 @@
 		# mark it visited
 		$visited->{$i}++;
 
-		my $row = $sorted_marc_record[$i];
+		my $row = dclone( $sorted_marc_record[$i] );
 
 		# field and subfield which is key for
 		# marc_repeatable_subfield and u
-		my $fsf = $row->[0] . $row->[3];
+		my $fsf = $row->[0] . ( $row->[3] || '' );
 
 		if ($debug > 1) {
 
@@ -285,7 +326,7 @@
 		warn "## saved/3 ", dump( $field ),$/ if ($debug);
 	}
 
-	return @m;
+	return \@m;
 }
 
 =head2 _debug
@@ -299,7 +340,7 @@
 sub _debug {
 	my $l = shift;
 	return $debug unless defined($l);
-	warn "debug level $l" if ($l > 0);
+	warn "debug level $l",$/ if ($l > 0);
 	$debug = $l;
 }
 
@@ -381,6 +422,7 @@
 Save value for MARC field
 
   marc('900','a', rec('200','a') );
+  marc('001', rec('000') );
 
 =cut
 
@@ -388,14 +430,21 @@
 	my $f = shift or die "marc needs field";
 	die "marc field must be numer" unless ($f =~ /^\d+$/);
 
-	my $sf = shift or die "marc needs subfield";
+	my $sf;
+	if ($f >= 10) {
+		$sf = shift or die "marc needs subfield";
+	}
 
 	foreach (@_) {
 		my $v = $_;		# make var read-write for Encode
 		next unless (defined($v) && $v !~ /^\s*$/);
 		from_to($v, 'iso-8859-2', $marc_encoding) if ($marc_encoding);
 		my ($i1,$i2) = defined($marc_indicators->{$f}) ? @{ $marc_indicators->{$f} } : (' ',' ');
-		push @{ $marc_record }, [ $f, $i1, $i2, $sf => $v ];
+		if (defined $sf) {
+			push @{ $marc_record->[ $marc_record_offset ] }, [ $f, $i1, $i2, $sf => $v ];
+		} else {
+			push @{ $marc_record->[ $marc_record_offset ] }, [ $f, $v ];
+		}
 	}
 }
 
@@ -455,6 +504,8 @@
 	my ($i1,$i2) = defined($marc_indicators->{$f}) ? @{ $marc_indicators->{$f} } : (' ',' ');
 	my $m = [ $f, $i1, $i2 ];
 
+	warn "### marc_compose input subfields = ", dump(@_),$/ if ($debug > 2);
+
 	while (@_) {
 		my $sf = shift or die "marc_compose $f needs subfield";
 		my $v = shift;
@@ -462,14 +513,96 @@
 		next unless (defined($v) && $v !~ /^\s*$/);
 		from_to($v, 'iso-8859-2', $marc_encoding) if ($marc_encoding);
 		push @$m, ( $sf, $v );
-		warn "## ++ marc_compose($f,$sf,$v) ", dump( $m ) if ($debug > 1);
+		warn "## ++ marc_compose($f,$sf,$v) ", dump( $m ),$/ if ($debug > 1);
 	}
 
-	warn "## marc_compose(d) ", dump( $m ) if ($debug > 1);
+	warn "## marc_compose current marc = ", dump( $m ),$/ if ($debug > 1);
+
+	push @{ $marc_record->[ $marc_record_offset ] }, $m if ($#{$m} > 2);
+}
+
+=head2 marc_duplicate
+
+Generate copy of current MARC record and continue working on copy
+
+  marc_duplicate();
+
+Copies can be accessed using C<< _get_marc_fields( fetch_next => 1 ) >> or
+C<< _get_marc_fields( offset => 42 ) >>.
 
-	push @{ $marc_record }, $m if ($#{$m} > 2);
+=cut
+
+sub marc_duplicate {
+	 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);
+	 $marc_record_offset = $#{ $marc_record };
+	 warn "## marc_record_offset = $marc_record_offset", $/ if ($debug > 1);
 }
 
+=head2 marc_remove
+
+Remove some field or subfield from MARC record.
+
+  marc_remove('200');
+  marc_remove('200','a');
+
+This will erase field C<200> or C<200^a> from current MARC record.
+
+This is useful after calling C<marc_duplicate> or on it's own (but, you
+should probably just remove that subfield definition if you are not
+using C<marc_duplicate>).
+
+FIXME: support fields < 10.
+
+=cut
+
+sub marc_remove {
+	my ($f, $sf) = @_;
+
+	die "marc_remove needs record number" unless defined($f);
+
+	my $marc = $marc_record->[ $marc_record_offset ];
+
+	warn "### marc_remove before = ", dump( $marc ), $/ if ($debug > 2);
+
+	my $i = 0;
+	foreach ( 0 .. $#{ $marc } ) {
+		last unless (defined $marc->[$i]);
+		warn "#### working on ",dump( @{ $marc->[$i] }), $/ if ($debug > 3);
+		if ($marc->[$i]->[0] eq $f) {
+			if (! defined $sf) {
+				# remove whole field
+				splice @$marc, $i, 1;
+				warn "#### slice \@\$marc, $i, 1 = ",dump( @{ $marc }), $/ if ($debug > 3);
+				$i--;
+			} else {
+				foreach my $j ( 0 .. (( $#{ $marc->[$i] } - 3 ) / 2) ) {
+					my $o = ($j * 2) + 3;
+					if ($marc->[$i]->[$o] eq $sf) {
+						# remove subfield
+						splice @{$marc->[$i]}, $o, 2;
+						warn "#### slice \@{\$marc->[$i]}, $o, 2 = ", dump( @{ $marc }), $/ if ($debug > 3);
+						# is record now empty?
+						if ($#{ $marc->[$i] } == 2) {
+							splice @$marc, $i, 1;
+							warn "#### slice \@\$marc, $i, 1 = ", dump( @{ $marc }), $/ if ($debug > 3);
+							$i--;
+						};
+					}
+				}
+			}
+		}
+		$i++;
+	}
+
+	warn "### marc_remove($f", $sf ? ",$sf" : "", ") after = ", dump( $marc ), $/ if ($debug > 2);
+
+	$marc_record->[ $marc_record_offset ] = $marc;
+
+	warn "## full marc_record = ", dump( @{ $marc_record }), $/ if ($debug > 1);
+}
 
 =head1 Functions to extract data from input
 
@@ -488,7 +621,9 @@
 
 sub rec1 {
 	my $f = shift;
+	warn "rec1($f) = ", dump( $rec->{$f} ), $/ if ($debug > 1);
 	return unless (defined($rec) && defined($rec->{$f}));
+	warn "rec1($f) = ", dump( $rec->{$f} ), $/ if ($debug > 1);
 	if (ref($rec->{$f}) eq 'ARRAY') {
 		return map { 
 			if (ref($_) eq 'HASH') {
@@ -527,10 +662,16 @@
 =cut
 
 sub rec {
+	my @out;
 	if ($#_ == 0) {
-		return rec1(@_);
+		@out = rec1(@_);
 	} elsif ($#_ == 1) {
-		return rec2(@_);
+		@out = rec2(@_);
+	}
+	if (@out) {
+		return @out;
+	} else {
+		return '';
 	}
 }
 
@@ -636,7 +777,10 @@
 
 sub join_with {
 	my $d = shift;
-	return join($d, grep { defined($_) && $_ ne '' } @_);
+	warn "### join_with('$d',",dump(@_),")\n" if ($debug > 2);
+	my $v = join($d, grep { defined($_) && $_ ne '' } @_);
+	return '' unless defined($v);
+	return $v;
 }
 
 =head2 split_rec_on
@@ -658,15 +802,17 @@
 	die "split_rec_on need (fld,sf,regex[,part]" if ($#_ < 2);
 
 	my ($fld, $sf, $regex, $part) = @_;
-	warn "### regex ", ref($regex), $regex if ($debug > 2);
+	warn "### regex ", ref($regex), $regex, $/ if ($debug > 2);
 
 	my @r = rec( $fld, $sf );
 	my $v = shift @r;
-	warn "### first rec($fld,$sf) = ",dump($v) if ($debug > 2);
+	warn "### first rec($fld,$sf) = ",dump($v),$/ if ($debug > 2);
+
+	return '' if( ! defined($v) || $v =~ /^\s*$/);
 
 	my @s = split( $regex, $v );
-	warn "## split_rec_on($fld,$sf,$regex,$part) = ",dump(@s) if ($debug > 1);
-	if ($part > 0) {
+	warn "## split_rec_on($fld,$sf,$regex,$part) = ",dump(@s),$/ if ($debug > 1);
+	if ($part && $part > 0) {
 		return $s[ $part - 1 ];
 	} else {
 		return @s;