documented that hash filter gets also a field number [0.22]

[Biblio-Isis] / lib / Biblio / Isis.pm

diff --git a/lib/Biblio/Isis.pm b/lib/Biblio/Isis.pm
index 6f29e20..405c47f 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);
-       $VERSION     = 0.22_1;
+       $VERSION     = 0.22;
        @ISA         = qw (Exporter);
        #Give a hoot don't pollute, do not export more than needed by default
        @EXPORT      = qw ();
@@ -84,7 +84,7 @@ Open ISIS database
        read_fdt => 1,
        include_deleted => 1,
        hash_filter => sub {
-               my $v = shift;
+               my ($v,$field_number) = @_;
                $v =~ s#foo#bar#g;
        },
        debug => 1,
@@ -114,7 +114,9 @@ Don't skip logically deleted records in ISIS.
 
 =item hash_filter
 
-Filter code ref which will be used before data is converted to hash.
+Filter code ref which will be used before data is converted to hash. It will
+receive two arguments, whole line from current field (in C<< $_[0] >>) and
+field number (in C<< $_[1] >>).
 
 =item debug
 
@@ -519,9 +521,6 @@ There is also more elaborative way to call C<to_hash> like this:
   my $hash = $isis->to_hash({
        mfn => 42,
        include_subfields => 1,
-       regexps => [
-               's/something/else/g',
-       ],
   });
 
 Each option controll creation of hash:
@@ -565,8 +564,6 @@ sub to_hash {
                $mfn = $arg->{mfn} || confess "need mfn in arguments";
        }
 
-       confess "regexps must be HASH" if ($arg->{regexps} && ref($arg->{regexps}) ne 'HASH');
-
        # init record to include MFN as field 000
        my $rec = { '000' => [ $mfn ] };
 
@@ -581,20 +578,10 @@ sub to_hash {
 
                        # filter output
                        if ($self->{'hash_filter'}) {
-                               $l = $self->{'hash_filter'}->($l);
+                               $l = $self->{'hash_filter'}->($l, $f_nr);
                                next unless defined($l);
                        }
 
-                       # apply regexps
-                       if ($arg->{regexps} && defined($arg->{regexps}->{$f_nr})) {
-                               confess "regexps->{$f_nr} must be ARRAY" if (ref($arg->{regexps}->{$f_nr}) ne 'ARRAY');
-                               my $c = 0;
-                               foreach my $r (@{ $arg->{regexps}->{$f_nr} }) {
-                                       while ( eval '$l =~ ' . $r ) { $c++ };
-                               }
-                               warn "## field $f_nr triggered $c regexpes\n" if ($c && $self->{debug});
-                       }
-
                        my $val;
                        my $r_sf;       # repeatable subfields in this record
 
@@ -766,6 +753,10 @@ older versions if you really have to):
 
 =over 8 
 
+=item 0.22
+
+Added field number when calling C<hash_filter>
+
 =item 0.21
 
 Added C<join_subfields_with> to L</new> and L</to_hash>.