--- trunk/t/002_isis.t	2005/01/05 15:46:26	32
+++ trunk/t/2_isis.t	2006/07/08 14:21:49	55
@@ -3,19 +3,32 @@
 use strict;
 use blib;
 
-use Data::Dumper;
+use Test::More tests => 128;
+use File::Spec;
 
-use Test::More tests => 110;
+BEGIN {
+	use_ok( 'Biblio::Isis' );
+	eval "use Data::Dump";
+
+	if (! $@) {
+		*Dumper = *Data::Dump::dump;
+	} else {
+		use Data::Dumper;
+	}
+}
 
-BEGIN { use_ok( 'IsisDB' ); }
 
+my $debug = length( shift @ARGV );
 my $isis;
 
+my $path_winisis = File::Spec->catfile('data', 'winisis', 'BIBL');
+my $path_isismarc = File::Spec->catfile('data', 'isismarc', 'BIBL');
+
 sub test_data {
 
 	my $args = {@_};
 
-	isa_ok ($isis, 'IsisDB');
+	isa_ok ($isis, 'Biblio::Isis');
 
 	cmp_ok($isis->count, '==', 5, "count is 5");
 
@@ -88,22 +101,30 @@
 		'10' => [ '^a0-340-59691-0' ],
 	}, {
 		# identifier test
-		'225' => [ '1#^aMcGraw-Hill series in Psychology' ],
 		'200' => [ '1#^aPsychology^fCamille B. Wortman, Elizabeth F. Loftus, Mary E. Marshal' ],
+		225 => ["1#^aMcGraw-Hill series in Psychology"],
+		205 => ["^a4th ed"],
 	} ];
 		
 	foreach my $mfn (1 .. $isis->count) {
+
 		my $rec;
 		ok($rec = $isis->fetch($mfn), "fetch $mfn");
 
+		diag "<<<<< rec = ",Dumper( $rec ), "\n>>>>> data = ", Dumper( $data->[$mfn-1] ) if ($debug);
+
 		foreach my $f (keys %{$data->[$mfn-1]}) {
 			my $i = 0;
 			foreach my $v (@{$data->[$mfn-1]->{$f}}) {
 				$v =~ s/^[01# ][01# ]// if ($args->{no_ident});
-				cmp_ok($v, '==', $rec->{$f}->[$i], "MFN $mfn $f:$i $v");
+				diag "compare '", $rec->{$f}->[$i], "' eq '$v'" if ($debug);
+				cmp_ok($rec->{$f}->[$i], 'eq', $v, "MFN $mfn field: $f offset: $i");
 				$i++;
 			}
 		}
+
+		cmp_ok($isis->mfn, '==', $mfn, 'mfn');
+
 	}
 
 	# test to_ascii
@@ -121,12 +142,13 @@
 
 }
 
-$isis = IsisDB->new (
-	isisdb => './data/winisis/BIBL',
+$isis = Biblio::Isis->new (
+	isisdb => $path_winisis,
 	include_deleted => 1,
+	debug => $debug > 1 ? ($debug - 1) : 0,
 );
 
-print Dumper($isis);
+diag "new Biblio::Isis = ", Dumper($isis) if ($debug);
 
 test_data(
 	no_ident => 1,
@@ -135,12 +157,12 @@
 		4fb38537a94f3f5954e40d9536b942b0
 		579a7c6901c654bdeac10547a98e5b71
 		7d2adf1675c83283aa9b82bf343e3d85
-		daf2cf86ca7e188e8360a185f3b43423
+		4cc1f798bbcf36862f7aa78c3410801a
 	) ],
 );
 
-$isis = IsisDB->new (
-	isisdb => './data/isismarc/BIBL',
+$isis = Biblio::Isis->new (
+	isisdb => $path_isismarc,
 	include_deleted => 1,
 );
 
@@ -156,18 +178,63 @@
 
 # check logically deleted
 
-$isis = IsisDB->new (
-	isisdb => './data/winisis/BIBL',
+$isis = Biblio::Isis->new (
+	isisdb => $path_winisis,
 	include_deleted => 1,
 );
 
 ok($isis->fetch(3), "deleted found");
 cmp_ok($isis->{deleted}, '==', 3, "MFN 3 is deleted");
+ok($isis->{record}, "record exists");
+
+diag "record = ",Dumper($isis->{record}) if ($debug);
 
-$isis = IsisDB->new (
-	isisdb => './data/winisis/BIBL',
+$isis = Biblio::Isis->new (
+	isisdb => $path_winisis,
+	debug => $debug,
 );
 
 ok(! $isis->fetch(3), "deleted not found");
 cmp_ok($isis->{deleted}, '==', 3, "MFN 3 is deleted");
+ok(! $isis->{record}, 'no record');
+
+$isis->{record} = {
+	900 => [ '^a900a^b900b^c900c' ],
+	901 => [
+		'^a901a-1^b901b-1^c901c-1',
+		'^a901a-2^b901b-2',
+		'^a901a-3',
+	],
+	902 => [
+		'^aa1^aa2^aa3^bb1^aa4^bb2^cc1^aa5',
+	],
+};
+$isis->{current_mfn} = 42;
+
+ok(my $hash = $isis->to_hash( $isis->mfn ), 'to_hash');
+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');
+
+ok(my $ascii = $isis->to_ascii( $isis->mfn ), 'to_ascii');
+diag "to_ascii = \n", $ascii if ($debug);
+cmp_ok($ascii, 'eq', <<'__END_OF_ASCII__', 'to_ascii output');
+0	42
+900	^a900a^b900b^c900c
+901	^a901a-1^b901b-1^c901c-1
+901	^a901a-2^b901b-2
+901	^a901a-3
+902	^aa1^aa2^aa3^bb1^aa4^bb2^cc1^aa5
+__END_OF_ASCII__
+