--- trunk/lib/WebPAC/Normalize.pm	2006/07/02 16:14:41	562
+++ trunk/lib/WebPAC/Normalize.pm	2006/07/03 14:30:22	571
@@ -7,7 +7,7 @@
 
 	tag search display
 	marc marc_indicators marc_repeatable_subfield
-	marc_compose
+	marc_compose marc_leader
 
 	rec1 rec2 rec
 	regex prefix suffix surround
@@ -33,11 +33,11 @@
 
 =head1 VERSION
 
-Version 0.08
+Version 0.09
 
 =cut
 
-our $VERSION = '0.08';
+our $VERSION = '0.09';
 
 =head1 SYNOPSIS
 
@@ -299,7 +299,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;
 }
 
@@ -357,11 +357,31 @@
 	$out->{$name}->{search} = \@o;
 }
 
+=head2 marc_leader
+
+Setup fields within MARC leader or get leader
+
+  marc_leader('05','c');
+  my $leader = marc_leader();
+
+=cut
+
+sub marc_leader {
+	my ($offset,$value) = @_;
+
+	if ($offset) {
+		$out->{' leader'}->{ $offset } = $value;
+	} else {
+		return $out->{' leader'};
+	}
+}
+
 =head2 marc
 
 Save value for MARC field
 
   marc('900','a', rec('200','a') );
+  marc('001', rec('000') );
 
 =cut
 
@@ -369,14 +389,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 }, [ $f, $i1, $i2, $sf => $v ];
+		} else {
+			push @{ $marc_record }, [ $f, $v ];
+		}
 	}
 }
 
@@ -438,17 +465,17 @@
 
 	while (@_) {
 		my $sf = shift or die "marc_compose $f needs subfield";
-		my $v = shift or die "marc_compose $f needs value for subfield $sf";
+		my $v = shift;
 
 		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(d) ", dump( $m ),$/ if ($debug > 1);
 
-	push @{ $marc_record }, $m;
+	push @{ $marc_record }, $m if ($#{$m} > 2);
 }
 
 
@@ -469,7 +496,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') {
@@ -639,15 +668,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;