X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=t%2F2_isis.t;h=1ebebe1fda0c6c19d5ca0c3fb89f59b5c9c0581a;hb=02bc52c86c5997410f90477bba81271e64502a32;hp=de74585f69ac963f736e2eda776c027495d926c0;hpb=76f67433b94bf607e940c25db70cc753e3ffa211;p=Biblio-Isis

diff --git a/t/2_isis.t b/t/2_isis.t
index de74585..1ebebe1 100755
--- a/t/2_isis.t
+++ b/t/2_isis.t
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 128;
+use Test::More tests => 174;
 use File::Spec;
 
 BEGIN {
@@ -18,7 +18,7 @@ BEGIN {
 }
 
 
-my $debug = length( shift @ARGV );
+my $debug = length( shift(@ARGV) || '' );
 my $isis;
 
 my $path_winisis = File::Spec->catfile('data', 'winisis', 'BIBL');
@@ -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");
@@ -237,4 +243,38 @@ cmp_ok($ascii, 'eq', <<'__END_OF_ASCII__', 'to_ascii output');
 902	^aa1^aa2^aa3^bb1^aa4^bb2^cc1^aa5
 __END_OF_ASCII__
 
+ok(my $hash2 = $isis->to_hash({ mfn => $isis->mfn }), 'to_hash(mfn)');
+is_deeply( $hash2, $hash, 'same 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, {
+  "000" => [42],
+  900   => [
+	{ a => "900a", b => "900b", c => "900c", subfields => ["a", 0, "b", 0, "c", 0] },
+  ],
+  901   => [
+	{ a => "901a-1", b => "901b-1", c => "901c-1", subfields => ["a", 0, "b", 0, "c", 0] },
+	{ a => "901a-2", b => "901b-2", subfields => ["a", 0, "b", 0] },
+	{ a => "901a-3", subfields => ["a", 0] },
+  ],
+  902   => [
+	{ a => ["a1", "a2", "a3", "a4", "a5"], b => ["b1", "b2"], c => "c1",
+	  subfields => ["a", 0, "a", 1, "a", 2, "b", 0, "a", 3, "b", 1, "c", 0, "a", 4],
+	},
+  ],
+}, 'hash is_deeply');
+
+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, {
+   "000" => [42],
+   900   => [{ a => "900a", b => "900b", c => "900c" }],
+   901   => [
+              { a => "901a-1", b => "901b-1", c => "901c-1" },
+              { a => "901a-2", b => "901b-2" },
+              { a => "901a-3" },
+            ],
+   902   => [{ a => "a1 ; a2 ; a3 ; a4 ; a5", b => "b1 ; b2", c => "c1" }],
+}, 'hash is_deeply');