--- trunk/lib/WebPAC/Normalize.pm 2006/07/02 21:30:00 568 +++ trunk/lib/WebPAC/Normalize.pm 2006/07/03 14:30:22 571 @@ -381,6 +381,7 @@ Save value for MARC field marc('900','a', rec('200','a') ); + marc('001', rec('000') ); =cut @@ -388,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 ]; + } } } @@ -488,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') { @@ -671,7 +681,7 @@ if ($part && $part > 0) { return $s[ $part - 1 ]; } else { - return [ @s ]; + return @s; } }