--- trunk/t/2_isis.t	2006/07/07 22:33:06	52
+++ trunk/t/2_isis.t	2006/07/13 09:13:25	63
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 112;
+use Test::More tests => 139;
 use File::Spec;
 
 BEGIN {
@@ -18,7 +18,7 @@
 }
 
 
-my $debug = shift @ARGV;
+my $debug = length( shift(@ARGV) || '' );
 my $isis;
 
 my $path_winisis = File::Spec->catfile('data', 'winisis', 'BIBL');
@@ -111,8 +111,7 @@
 		my $rec;
 		ok($rec = $isis->fetch($mfn), "fetch $mfn");
 
-
-		diag "<<<<< rec: ",Dumper( $rec ), "\n>>>>> row:", Dumper( $data->[$mfn-1] ) if ($debug);
+		diag "<<<<< rec = ",Dumper( $rec ), "\n>>>>> data = ", Dumper( $data->[$mfn-1] ) if ($debug);
 
 		foreach my $f (keys %{$data->[$mfn-1]}) {
 			my $i = 0;
@@ -123,6 +122,9 @@
 				$i++;
 			}
 		}
+
+		cmp_ok($isis->mfn, '==', $mfn, 'mfn');
+
 	}
 
 	# test to_ascii
@@ -143,7 +145,7 @@
 $isis = Biblio::Isis->new (
 	isisdb => $path_winisis,
 	include_deleted => 1,
-	debug => $debug,
+	debug => $debug > 1 ? ($debug - 1) : 0,
 );
 
 diag "new Biblio::Isis = ", Dumper($isis) if ($debug);
@@ -183,6 +185,9 @@
 
 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 = Biblio::Isis->new (
 	isisdb => $path_winisis,
@@ -191,4 +196,151 @@
 
 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__
+
+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');
+
+# 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',
+	],
+	902 => [
+		'^a902a-1^b9002a-2',
+	],
+};
+
+my $split_on_delimiters = {
+	900 => { '^a' => { ' : ' => '^b', ' ; ' => '^c' } },
+	901 => { 
+		'^a' => { ' x ' => '^b', ' y ' => '^c' },
+		'^b' => { ' x ' => '^b' },
+		'^c' => { ' y ' => '^c' }
+	},
+	902 => { '*' => { '^b' => ' * ' } },
+};
+
+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 $from (keys %{ $split_on_delimiters->{$f}->{$sf} }) {
+			my $to = $split_on_delimiters->{$f}->{$sf}->{$from};
+			#die "no field?" unless defined($to);
+warn "----- transform: |$from| -> |$to|\n";
+
+			if ($sf =~ /^\^/) {
+				my $regex = 
+					's/\Q'. $sf .'\E([^\^]+)\Q'. $from .'\E([^\^]+)/'. $sf .'$1'. $to .'$2/g';
+				push @{ $regexpes->{$f} }, $regex;
+warn ">>>>> $regex [sf]\n";
+			} else {
+				my $regex =
+					's/\Q'. $from .'\E/'. $to .'/g';
+				push @{ $regexpes->{$f} }, $regex;
+warn ">>>>> $regex [global]\n";
+			}
+
+		}
+	}
+}
+
+diag "generated regexpes = ", Dumper( $regexpes );
 
+ok($hash = $isis->to_hash({ mfn => $isis->mfn, regexps => $regexpes, }), 'to_hash(mfn,regexpes)');
+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"] },
+            ],
+   902   => [{ a => "902a-1 * 9002a-2" }],
+}, 'hash is_deeply');
+
+ok($isis->{regexpes} = $regexpes, 'isis->{regexpes}');
+ok($hash2 = $isis->to_hash( $isis->mfn ), 'to_hash(mfn), global regexpes');
+diag "to_hash = ",Dumper( $hash ) if ($debug);
+is_deeply( $hash2, $hash, 'hash is_deeply');