added hash_filter to to_hash [0.23]

git-svn-id: file:///home/dpavlin/svn/Biblio-Isis/trunk@66 4670fa4d-42ec-0310-ab5b-a66af6943492

diff --git a/lib/Biblio/Isis.pm b/lib/Biblio/Isis.pm
index 405c47f..f310501 100644 (file)
--- a/lib/Biblio/Isis.pm
+++ b/lib/Biblio/Isis.pm
@@ -7,7 +7,7 @@ use File::Glob qw(:globally :nocase);
 BEGIN {
        use Exporter ();
        use vars qw ($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 BEGIN {
        use Exporter ();
        use vars qw ($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);

-       $VERSION     = 0.22;
+       $VERSION     = 0.23;

        @ISA         = qw (Exporter);
        #Give a hoot don't pollute, do not export more than needed by default
        @EXPORT      = qw ();
        @ISA         = qw (Exporter);
        #Give a hoot don't pollute, do not export more than needed by default
        @EXPORT      = qw ();


@@ -548,6 +548,10 @@ have original record subfield order and index to that subfield like this:
 Define delimiter which will be used to join repeatable subfields. You can
 specify option here instead in L</new> if you want to have per-record control.
 
 Define delimiter which will be used to join repeatable subfields. You can
 specify option here instead in L</new> if you want to have per-record control.
 

+=item hash_filter
+
+You can override C<hash_filter> defined in L</new> using this option.
+

 =back
 
 =cut
 =back
 
 =cut


@@ -559,9 +563,12 @@ sub to_hash {
        my $mfn = shift || confess "need mfn!";
        my $arg;
 
        my $mfn = shift || confess "need mfn!";
        my $arg;
 

+       my $hash_filter = $self->{hash_filter};
+

        if (ref($mfn) eq 'HASH') {
                $arg = $mfn;
                $mfn = $arg->{mfn} || confess "need mfn in arguments";
        if (ref($mfn) eq 'HASH') {
                $arg = $mfn;
                $mfn = $arg->{mfn} || confess "need mfn in arguments";

+               $hash_filter = $arg->{hash_filter} if ($arg->{hash_filter});

        }
 
        # init record to include MFN as field 000
        }
 
        # init record to include MFN as field 000


@@ -577,10 +584,8 @@ sub to_hash {
                foreach my $l (@{$row->{$f_nr}}) {
 
                        # filter output
                foreach my $l (@{$row->{$f_nr}}) {
 
                        # filter output

-                       if ($self->{'hash_filter'}) {
-                               $l = $self->{'hash_filter'}->($l, $f_nr);
-                               next unless defined($l);
-                       }
+                       $l = $hash_filter->($l, $f_nr) if ($hash_filter);
+                       next unless defined($l);

 
                        my $val;
                        my $r_sf;       # repeatable subfields in this record
 
                        my $val;
                        my $r_sf;       # repeatable subfields in this record


@@ -746,13 +751,17 @@ know any details about it's version.
 As this is young module, new features are added in subsequent version. It's
 a good idea to specify version when using this module like this:
 
 As this is young module, new features are added in subsequent version. It's
 a good idea to specify version when using this module like this:
 

-  use Biblio::Isis 0.21
+  use Biblio::Isis 0.23

 
 Below is list of changes in specific version of module (so you can target
 older versions if you really have to):
 
 =over 8 
 
 
 Below is list of changes in specific version of module (so you can target
 older versions if you really have to):
 
 =over 8 
 

+=item 0.23
+
+Added C<hash_filter> to L</to_hash>
+

 =item 0.22
 
 Added field number when calling C<hash_filter>
 =item 0.22
 
 Added field number when calling C<hash_filter>

diff --git a/t/2_isis.t b/t/2_isis.t
index 1ebebe1..2d23c2a 100755 (executable)
--- a/t/2_isis.t
+++ b/t/2_isis.t
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
 use strict;
 use blib;
 

-use Test::More tests => 174;
+use Test::More tests => 176;

 use File::Spec;
 
 BEGIN {
 use File::Spec;
 
 BEGIN {


@@ -246,6 +246,7 @@ __END_OF_ASCII__
 ok(my $hash2 = $isis->to_hash({ mfn => $isis->mfn }), 'to_hash(mfn)');
 is_deeply( $hash2, $hash, 'same hash' );
 
 ok(my $hash2 = $isis->to_hash({ mfn => $isis->mfn }), 'to_hash(mfn)');
 is_deeply( $hash2, $hash, 'same hash' );
 

+# test to_hash( include_subfields )

 ok($hash = $isis->to_hash({ mfn => $isis->mfn, include_subfields => 1 }), 'to_hash(mfn,include_subfields)');
 diag "to_hash = ",Dumper( $hash ) if ($debug);
 is_deeply( $hash, {
 ok($hash = $isis->to_hash({ mfn => $isis->mfn, include_subfields => 1 }), 'to_hash(mfn,include_subfields)');
 diag "to_hash = ",Dumper( $hash ) if ($debug);
 is_deeply( $hash, {


@@ -265,6 +266,7 @@ is_deeply( $hash, {
   ],
 }, 'hash is_deeply');
 
   ],
 }, 'hash is_deeply');
 

+# test to_hash( join_subfields_with )

 ok($hash = $isis->to_hash({ mfn => $isis->mfn, join_subfields_with => ' ; ' }), 'to_hash(mfn,join_subfields_with)');
 diag "to_hash = ",Dumper( $hash ) if ($debug);
 is_deeply( $hash, {
 ok($hash = $isis->to_hash({ mfn => $isis->mfn, join_subfields_with => ' ; ' }), 'to_hash(mfn,join_subfields_with)');
 diag "to_hash = ",Dumper( $hash ) if ($debug);
 is_deeply( $hash, {


@@ -278,3 +280,27 @@ is_deeply( $hash, {
    902   => [{ a => "a1 ; a2 ; a3 ; a4 ; a5", b => "b1 ; b2", c => "c1" }],
 }, 'hash is_deeply');
 
    902   => [{ a => "a1 ; a2 ; a3 ; a4 ; a5", b => "b1 ; b2", c => "c1" }],
 }, 'hash is_deeply');
 

+# test to_hash( hash_filter )
+ok($hash = $isis->to_hash({ mfn => $isis->mfn, hash_filter => sub {
+       my ($l,$f) = @_;
+       if ($f == 900) {
+               $l =~ s/0/o/g;
+       } elsif ($f == 901) {
+               $l =~ s/1/i/g;
+       } elsif ($f == 902) {
+               $l =~ s/2/s/g;
+       }
+       return $l;
+}}), 'to_hash(mfn,hash_filter)');
+diag "to_hash = ",Dumper( $hash ) if ($debug);
+is_deeply( $hash, {
+   "000" => [42],
+   900   => [{ a => "9ooa", b => "9oob", c => "9ooc" }],
+   901   => [
+              { a => "90ia-i", b => "90ib-i", c => "90ic-i" },
+              { a => "90ia-2", b => "90ib-2" },
+              { a => "90ia-3" },
+            ],
+   902   => [{ a => ["a1", "as", "a3", "a4", "a5"], b => ["b1", "bs"], c => "c1" }],
+}, 'hash is_deeply');
+