--- trunk/t/002_isis.t	2005/01/01 22:29:49	28
+++ trunk/t/002_isis.t	2006/07/07 21:07:44	49
@@ -3,21 +3,34 @@
 use strict;
 use blib;
 
-use Data::Dumper;
+use Test::More tests => 112;
+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 = 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
 
@@ -88,19 +101,25 @@
 		'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->{'maxmfn'}) {
+	foreach my $mfn (1 .. $isis->count) {
+
 		my $rec;
 		ok($rec = $isis->fetch($mfn), "fetch $mfn");
 
+
+		diag "<<<<< rec: ",Dumper( $rec ), "\n>>>>> row:", Dumper( $data->[$mfn-1] );
+
 		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++;
 			}
 		}
@@ -113,7 +132,7 @@
 
 		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($md5, 'eq', $args->{md5_ascii}[$mfn - 1], "md5 $mfn");
 		}
@@ -121,12 +140,13 @@
 
 }
 
-$isis = IsisDB->new (
-	isisdb => './data/winisis/BIBL',
+$isis = Biblio::Isis->new (
+	isisdb => $path_winisis,
 	include_deleted => 1,
+	debug => $debug,
 );
 
-print Dumper($isis);
+diag "isis-new result: ", Dumper($isis);
 
 test_data(
 	no_ident => 1,
@@ -135,12 +155,12 @@
 		4fb38537a94f3f5954e40d9536b942b0
 		579a7c6901c654bdeac10547a98e5b71
 		7d2adf1675c83283aa9b82bf343e3d85
-		daf2cf86ca7e188e8360a185f3b43423
+		4cc1f798bbcf36862f7aa78c3410801a
 	) ],
 );
 
-$isis = IsisDB->new (
-	isisdb => './data/isismarc/BIBL',
+$isis = Biblio::Isis->new (
+	isisdb => $path_isismarc,
 	include_deleted => 1,
 );
 
@@ -156,16 +176,17 @@
 
 # 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");
 
-$isis = IsisDB->new (
-	isisdb => './data/winisis/BIBL',
+$isis = Biblio::Isis->new (
+	isisdb => $path_winisis,
+	debug => $debug,
 );
 
 ok(! $isis->fetch(3), "deleted not found");