X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2F2_isis.t;h=6ed4e8527ab800a96c1bfa189f4cfdc5cb66c606;hb=92f899141244fb70799380647bb64fa1a7787ee4;hp=dd467711e68e3eff4edf23575af4b2cbdac95c16;hpb=1d7ffb42f40b3837c71123f616cc8ba7349ffd5e;p=Biblio-Isis

diff --git a/t/2_isis.t b/t/2_isis.t
index dd46771..6ed4e85 100755
--- a/t/2_isis.t
+++ b/t/2_isis.t
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 136;
+use Test::More tests => 181;
 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");
@@ -240,6 +246,7 @@ __END_OF_ASCII__
 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, {
@@ -259,6 +266,7 @@ is_deeply( $hash, {
   ],
 }, '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, {
@@ -272,58 +280,48 @@ 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',
-	],
-};
-
-my $split_on_delimiters = {
-	900 => { a => { ' : ' => 'b', ' ; ' => 'c' } },
-	901 => { 
-		a => { ' x ' => 'b', ' y ' => 'c' },
-		b => { ' x ' => 'b' },
-		c => { ' y ' => 'c' }
-	},
-};
-
-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 $patt (keys %{ $split_on_delimiters->{$f}->{$sf} }) {
-			my $new_sf = $split_on_delimiters->{$f}->{$sf}->{$patt} || die "no field?";
-warn "----- patt: $patt -> $new_sf\n";
-
-			# fool-proof spaces in pattern
-			$patt =~ s/\s+/\\s\+/g;
-	
-			push @{ $regexpes->{$f} },
-		's/\^' . $sf . '([^\^]+)' . $patt . '([^\^]+)/^' . $sf . '$1^' . $new_sf . '$2/g';
-		}
-	}
-}
-
-diag "generated regexpes = ", Dumper( $regexpes );
-
+my $isis2;
+ok($isis2 = Biblio::Isis->new (
+	isisdb => $path_winisis,
+	join_subfields_with => ' ; ',
+),"new( join_subfields_with )");
+ok($isis2->{record} = $isis->{record}, "copy record");
+ok($isis2->{current_mfn} = $isis->{current_mfn}, "copy current_mfn");
 
-ok($hash = $isis->to_hash({ mfn => $isis->mfn, regexps => $regexpes, }), 'to_hash(mfn,regexpes)');
+ok($hash = $isis2->to_hash( $isis->mfn ), 'to_hash(mfn)');
 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"] },
+              { a => "901a-2", b => "901b-2" },
+              { a => "901a-3" },
+            ],
+   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');
+