added hash_filter as option when calling to_hash [0.12]

[MARC-Fast] / lib / MARC / Fast.pm

diff --git a/lib/MARC/Fast.pm b/lib/MARC/Fast.pm
index aef3d5b..3aa4c66 100644 (file)
--- a/lib/MARC/Fast.pm
+++ b/lib/MARC/Fast.pm
@@ -7,7 +7,7 @@ use Data::Dump qw/dump/;
 BEGIN {
        use Exporter ();
        use vars qw ($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-       $VERSION     = 0.10;
+       $VERSION     = 0.12;
        @ISA         = qw (Exporter);
        #Give a hoot don't pollute, do not export more than needed by default
        @EXPORT      = qw ();
@@ -277,11 +277,14 @@ sub last_leader {
 
 Read record with specified MFN and convert it to hash
 
-  my $hash = $marc->to_hash( $mfn, include_subfields => 1, );
+  my $hash = $marc->to_hash( $mfn, include_subfields => 1,
+       hash_filter => sub { my ($l,$tag) = @_; return $l; }
+  );
 
 It has ability to convert characters (using C<hash_filter>) from MARC
 database before creating structures enabling character re-mapping or quick
-fix-up of data.
+fix-up of data. If you specified C<hash_filter> both in C<new> and C<to_hash>
+only the one from C<to_hash> will be used.
 
 This function returns hash which is like this:
 
@@ -305,6 +308,7 @@ sub to_hash {
        my $mfn = shift || confess "need mfn!";
 
        my $args = {@_};
+       my $filter_coderef = $args->{'hash_filter'} || $self->{'hash_filter'};
 
        # init record to include MFN as field 000
        my $rec = { '000' => [ $mfn ] };
@@ -318,7 +322,7 @@ sub to_hash {
                        $l =~ s/\x1E$//;
 
                        # filter output
-                       $l = $self->{'hash_filter'}->($l, $tag) if ($self->{'hash_filter'});
+                       $l = $filter_coderef->($l, $tag) if $filter_coderef;
 
                        my $val;
 
@@ -333,18 +337,20 @@ sub to_hash {
                                foreach my $t (split(/\x1F/,$l)) {
                                        next if (! $t);
                                        my $f = substr($t,0,1);
+                                       my $v = substr($t,1);
 
                                        push @subfields, ( $f, $sf_usage->{$f}++ || 0 );
 
                                        # repeatable subfiled -- convert it to array
-                                       if ($val->{$f}) {
+                                       if ( defined $val->{$f} ) {
                                                if ( ref($val->{$f}) ne 'ARRAY' ) {
-                                                       $val->{$f} = [ $val->{$f}, $val ];
+                                                       $val->{$f} = [ $val->{$f}, $v ];
                                                } else {
-                                                       push @{$val->{$f}}, $val;
+                                                       push @{$val->{$f}}, $v;
                                                }
+                                       } else {
+                                               $val->{$f} = $v;
                                        }
-                                       $val->{substr($t,0,1)} = substr($t,1);
                                }
                                $val->{subfields} = [ @subfields ] if $args->{include_subfields};
                        } else {