X-Git-Url: http://git.rot13.org/?p=Biblio-Isis;a=blobdiff_plain;f=lib%2FBiblio%2FIsis.pm;h=f31050170358f810eba050118f0bdd9e39649817;hp=6f29e200d52d4fdca2a82587b858edf1de733ea0;hb=a82f5a36ffcbeaf8a8150b326ff77cb4301e0878;hpb=1d7ffb42f40b3837c71123f616cc8ba7349ffd5e

diff --git a/lib/Biblio/Isis.pm b/lib/Biblio/Isis.pm
index 6f29e20..f310501 100644
--- 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.23;
 	@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:
@@ -549,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.
 
+=item hash_filter
+
+You can override C<hash_filter> defined in L</new> using this option.
+
 =back
 
 =cut
@@ -560,13 +563,14 @@ sub to_hash {
 	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";
+		$hash_filter = $arg->{hash_filter} if ($arg->{hash_filter});
 	}
 
-	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 ] };
 
@@ -580,20 +584,8 @@ sub to_hash {
 		foreach my $l (@{$row->{$f_nr}}) {
 
 			# filter output
-			if ($self->{'hash_filter'}) {
-				$l = $self->{'hash_filter'}->($l);
-				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});
-			}
+			$l = $hash_filter->($l, $f_nr) if ($hash_filter);
+			next unless defined($l);
 
 			my $val;
 			my $r_sf;	# repeatable subfields in this record
@@ -759,13 +751,21 @@ 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:
 
-  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 
 
+=item 0.23
+
+Added C<hash_filter> to L</to_hash>
+
+=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>.