--- trunk/lib/WebPAC/Normalize.pm	2006/10/31 13:19:47	766
+++ trunk/lib/WebPAC/Normalize.pm	2007/04/01 21:47:42	812
@@ -19,6 +19,9 @@
 	save_into_lookup
 
 	split_rec_on
+
+	get set
+	count
 /;
 
 use warnings;
@@ -39,11 +42,11 @@
 
 =head1 VERSION
 
-Version 0.23
+Version 0.26
 
 =cut
 
-our $VERSION = '0.23';
+our $VERSION = '0.26';
 
 =head1 SYNOPSIS
 
@@ -164,7 +167,7 @@
 
 =cut
 
-my ($out, $marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators, $leader);
+my ($out, $marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators, $marc_leader);
 my ($marc_record_offset, $marc_fetch_offset) = (0, 0);
 
 sub _get_ds {
@@ -181,7 +184,7 @@
 
 sub _clean_ds {
 	my $a = {@_};
-	($out,$marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators, $leader) = ();
+	($out,$marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators, $marc_leader) = ();
 	($marc_record_offset, $marc_fetch_offset) = (0,0);
 	$marc_encoding = $a->{marc_encoding};
 }
@@ -487,9 +490,9 @@
 	my ($offset,$value) = @_;
 
 	if ($offset) {
-		$leader->{ $offset } = $value;
+		$marc_leader->{ $offset } = $value;
 	} else {
-		return $leader;
+		return $marc_leader;
 	}
 }
 
@@ -635,6 +638,10 @@
 
 This will erase field C<200> or C<200^a> from current MARC record.
 
+  marc_remove('*');
+
+Will remove all fields in 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>).
@@ -652,39 +659,47 @@
 
 	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--;
-						};
+	if ($f eq '*') {
+
+		delete( $marc_record->[ $marc_record_offset ] );
+		warn "## full marc_record = ", dump( @{ $marc_record }), $/ if ($debug > 1);
+
+	} else {
+
+		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++;
 		}
-		$i++;
-	}
 
-	warn "### marc_remove($f", $sf ? ",$sf" : "", ") after = ", dump( $marc ), $/ if ($debug > 2);
+		warn "### marc_remove($f", $sf ? ",$sf" : "", ") after = ", dump( $marc ), $/ if ($debug > 2);
 
-	$marc_record->[ $marc_record_offset ] = $marc;
+		$marc_record->[ $marc_record_offset ] = $marc;
+	}
 
 	warn "## full marc_record = ", dump( @{ $marc_record }), $/ if ($debug > 1);
 }
@@ -1248,5 +1263,45 @@
 	}
 }
 
+my $hash;
+
+=head2 set
+
+  set( key => 'value' );
+
+=cut
+
+sub set {
+	my ($k,$v) = @_;
+	warn "## set ( $k => ", dump($v), " )", $/ if ( $debug );
+	$hash->{$k} = $v;
+};
+
+=head2 get
+
+  get( 'key' );
+
+=cut
+
+sub get {
+	my $k = shift || return;
+	my $v = $hash->{$k};
+	warn "## get $k = ", dump( $v ), $/ if ( $debug );
+	return $v;
+}
+
+=head2 count
+
+  if ( count( @result ) == 1 ) {
+  	# do something if only 1 result is there
+  }
+
+=cut
+
+sub count {
+	warn "## count ",dump(@_),$/ if ( $debug );
+	return @_ . '';
+}
+
 # END
 1;