--- trunk/t/2_isis.t	2006/07/08 14:21:49	55
+++ trunk/t/2_isis.t	2006/07/09 21:36:33	61
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 128;
+use Test::More tests => 136;
 use File::Spec;
 
 BEGIN {
@@ -18,7 +18,7 @@
 }
 
 
-my $debug = length( shift @ARGV );
+my $debug = length( shift(@ARGV) || '' );
 my $isis;
 
 my $path_winisis = File::Spec->catfile('data', 'winisis', 'BIBL');
@@ -237,4 +237,93 @@
 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',
+	],
+};
+
+my $split_on_delimiters = {
+	900 => { a => { ' : ' => 'b', ' ; ' => 'c' } },
+	901 => { 
+		a => { ' x ' => 'b', ' y ' => 'c' },
+		b => { ' x ' => 'b' },
+		c => { ' y ' => 'c' }
+	},
+};
+
+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 $patt (keys %{ $split_on_delimiters->{$f}->{$sf} }) {
+			my $new_sf = $split_on_delimiters->{$f}->{$sf}->{$patt} || die "no field?";
+warn "----- patt: $patt -> $new_sf\n";
+
+			# fool-proof spaces in pattern
+			$patt =~ s/\s+/\\s\+/g;
+	
+			push @{ $regexpes->{$f} },
+		's/\^' . $sf . '([^\^]+)' . $patt . '([^\^]+)/^' . $sf . '$1^' . $new_sf . '$2/g';
+		}
+	}
+}
+
+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"] },
+            ],
+}, 'hash is_deeply');