--- trunk/t/002_isis.t	2004/12/31 01:06:21	22
+++ trunk/t/002_isis.t	2005/01/12 19:28:41	38
@@ -5,26 +5,33 @@
 
 use Data::Dumper;
 
-use Test::More tests => 104;
+use Test::More tests => 110;
+use File::Spec;
 
-BEGIN { use_ok( 'IsisDB' ); }
+BEGIN { use_ok( 'Biblio::Isis' ); }
 
+my $debug = 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->{maxmfn}, '==', 5, "maxmfn set to 5");
+	cmp_ok($isis->count, '==', 5, "count is 5");
 
 	# test .CNT data
 
 	SKIP: {
 		skip "no CNT file for this database", 5 unless $isis->{cnt_file};
 
-		$isis->read_cnt;
+		ok(my $isis_cnt = $isis->read_cnt, "read_cnt");
+
+		cmp_ok(scalar keys %{$isis_cnt}, '==', 2, "returns 2 elements");
 
 		my $cnt = {
 			'1' => {
@@ -53,7 +60,7 @@
 
 		foreach my $c (keys %{$cnt}) {
 			foreach my $kn (keys %{$cnt->{$c}}) {
-				cmp_ok($isis->{cnt}->{$c}->{$kn}, '==', $cnt->{$c}->{$kn}, "cnt $c $kn same");
+				cmp_ok($isis_cnt->{$c}->{$kn}, '==', $cnt->{$c}->{$kn}, "cnt $c $kn same");
 			}
 		}
 	}
@@ -90,7 +97,7 @@
 		'200' => [ '1#^aPsychology^fCamille B. Wortman, Elizabeth F. Loftus, Mary E. Marshal' ],
 	} ];
 		
-	foreach my $mfn (1 .. $isis->{'maxmfn'}) {
+	foreach my $mfn (1 .. $isis->count) {
 		my $rec;
 		ok($rec = $isis->fetch($mfn), "fetch $mfn");
 
@@ -98,7 +105,7 @@
 			my $i = 0;
 			foreach my $v (@{$data->[$mfn-1]->{$f}}) {
 				$v =~ s/^[01# ][01# ]// if ($args->{no_ident});
-				cmp_ok($rec->{$f}->[$i], '==', $v, "MFN $mfn $f:$i $v");
+				cmp_ok($v, '==', $rec->{$f}->[$i], "MFN $mfn $f:$i $v");
 				$i++;
 			}
 		}
@@ -111,16 +118,18 @@
 
 		skip "no Digest::MD5 module", 5 if ($@);
 
-		foreach my $mfn (1 .. $isis->{'maxmfn'}) {
+		foreach my $mfn (1 .. $isis->count) {
 			my $md5 = md5_hex($isis->to_ascii($mfn));
-			cmp_ok($args->{md5_ascii}[$mfn - 1], 'eq', $md5, "md5 $mfn");
+			cmp_ok($md5, 'eq', $args->{md5_ascii}[$mfn - 1], "md5 $mfn");
 		}
 	}
 
 }
 
-$isis = IsisDB->new (
-	isisdb => './data/winisis/BIBL',
+$isis = Biblio::Isis->new (
+	isisdb => $path_winisis,
+	include_deleted => 1,
+	debug => $debug,
 );
 
 print Dumper($isis);
@@ -130,14 +139,15 @@
 	md5_ascii => [ qw(
 		a369eff702307ba12eb81656ee0587fe
 		4fb38537a94f3f5954e40d9536b942b0
-		498cc16c9e7ab0fdc29182533cc35d11
+		579a7c6901c654bdeac10547a98e5b71
 		7d2adf1675c83283aa9b82bf343e3d85
 		daf2cf86ca7e188e8360a185f3b43423
 	) ],
 );
 
-$isis = IsisDB->new (
-	isisdb => './data/isismarc/BIBL',
+$isis = Biblio::Isis->new (
+	isisdb => $path_isismarc,
+	include_deleted => 1,
 );
 
 test_data(
@@ -149,3 +159,22 @@
 		843b9ebccf16a498fba623c78f21b6c0
 	) ],
 );
+
+# check logically deleted
+
+$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");
+
+$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");
+