hash_filter now accepts whole line from record and field number. Removed

[Biblio-Isis] / t / 2_isis.t

diff --git a/t/2_isis.t b/t/2_isis.t
index f4a25d8..1ebebe1 100755 (executable)
--- a/t/2_isis.t
+++ b/t/2_isis.t
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 139;
+use Test::More tests => 174;
 use File::Spec;
 
 BEGIN {
@@ -192,6 +192,12 @@ diag "record = ",Dumper($isis->{record}) if ($debug);
 $isis = Biblio::Isis->new (
        isisdb => $path_winisis,
        debug => $debug,
+       hash_filter => sub {
+               my ($l,$nr) = @_;
+               ok(grep(/$nr/, keys %{ $isis->{record} }), "hash_filter $nr in record");
+               ok(grep(/\Q$l\E/, @{ $isis->{record}->{$nr} }), "hash_filter line $l found");
+               return($l);
+       },
 );
 
 ok(! $isis->fetch(3), "deleted not found");
@@ -272,75 +278,3 @@ is_deeply( $hash, {
    902   => [{ a => "a1 ; a2 ; a3 ; a4 ; a5", b => "b1 ; b2", c => "c1" }],
 }, 'hash is_deeply');
 
-# split_on_delimiters
-
-$isis->{record} = {
-       900 => [ '^a900a : 900b ; 900c' ],
-       901 => [
-               '^a901a-1 x 901b-1 y 901c-1',
-               '^b901b-2 x 901b-2',
-               '^c901c-3 y 901c-3',
-       ],
-       902 => [
-               '^a902a-1^b9002a-2',
-       ],
-};
-
-my $split_on_delimiters = {
-       900 => { '^a' => { ' : ' => '^b', ' ; ' => '^c' } },
-       901 => { 
-               '^a' => { ' x ' => '^b', ' y ' => '^c' },
-               '^b' => { ' x ' => '^b' },
-               '^c' => { ' y ' => '^c' }
-       },
-       902 => { '*' => { '^b' => ' * ' } },
-};
-
-diag "split_on_delimiters = ", Dumper($split_on_delimiters);
-
-my $regexpes;
-
-foreach my $f (keys %$split_on_delimiters) {
-warn "--- f: $f\n";
-       foreach my $sf (keys %{ $split_on_delimiters->{$f} }) {
-warn "---- sf: $sf\n";
-               foreach my $from (keys %{ $split_on_delimiters->{$f}->{$sf} }) {
-                       my $to = $split_on_delimiters->{$f}->{$sf}->{$from};
-                       #die "no field?" unless defined($to);
-warn "----- transform: |$from| -> |$to|\n";
-
-                       if ($sf =~ /^\^/) {
-                               my $regex = 
-                                       's/\Q'. $sf .'\E([^\^]+)\Q'. $from .'\E([^\^]+)/'. $sf .'$1'. $to .'$2/g';
-                               push @{ $regexpes->{$f} }, $regex;
-warn ">>>>> $regex [sf]\n";
-                       } else {
-                               my $regex =
-                                       's/\Q'. $from .'\E/'. $to .'/g';
-                               push @{ $regexpes->{$f} }, $regex;
-warn ">>>>> $regex [global]\n";
-                       }
-
-               }
-       }
-}
-
-diag "generated regexpes = ", Dumper( $regexpes );
-
-ok($hash = $isis->to_hash({ mfn => $isis->mfn, regexps => $regexpes, }), 'to_hash(mfn,regexpes)');
-diag "to_hash = ",Dumper( $hash ) if ($debug);
-is_deeply( $hash, {
-   "000" => [42],
-   900   => [{ a => "900a", b => "900b", c => "900c" }],
-   901   => [
-              { a => "901a-1", b => "901b-1", c => "901c-1" },
-              { b => ["901b-2", "901b-2"] },
-              { c => ["901c-3", "901c-3"] },
-            ],
-   902   => [{ a => "902a-1 * 9002a-2" }],
-}, 'hash is_deeply');
-
-ok($isis->{regexpes} = $regexpes, 'isis->{regexpes}');
-ok($hash2 = $isis->to_hash( $isis->mfn ), 'to_hash(mfn), global regexpes');
-diag "to_hash = ",Dumper( $hash ) if ($debug);
-is_deeply( $hash2, $hash, 'hash is_deeply');