--- trunk/t/3-normalize.t	2007/11/07 11:54:34	1013
+++ trunk/t/3-normalize.t	2007/11/10 11:11:16	1021
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 351;
+use Test::More tests => 343;
 
 BEGIN {
 	use_ok( 'WebPAC::Test' );
@@ -523,7 +523,7 @@
 		}
 
 		ok(my $marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
-		diag dump( $marc ) if ($debug);
+		diag dump( $marc ) if $debug;
 		diag "expects:\n", dump($struct) if ($debug > 1);
 		is_deeply( $marc, $struct, $msg );
 	}
@@ -864,6 +864,34 @@
 		[ '1-55860-701-3', '1-55860-701-3' ],
 	'isbn_10' );
 
+	# frec
+
+	my $rec = {
+			'200' => [ {
+				a => [ 'a1', 'a2' ], b => [ 'b1', 'b2' ], c => [ 'c1', 'c2' ],
+				subfields => [ qw/a 0 b 0 a 1 b 1 c 0 c 1/ ],
+			}, {
+				a => [ 'a3', 'a4', 'a5' ], b => 'b3', c => 'c3',
+				subfields => [ qw/a 0 a 1 b 0 c 0 a 2/ ],
+			} ],
+	};
+
+	test_rule( 'frec', $rec, qq{ frec(200) }, [ 'a1' ] );
+	test_rule( 'frec', $rec, qq{ frec(200,'a') }, [ 'a1' ] );
+	test_rule( 'frec', $rec, qq{ frec(200,'b') }, [ 'b1' ] );
+	test_rule( 'frec', $rec, qq{ frec(200,'c') }, [ 'c1' ] );
+
+	$rec->{'900'} = $rec->{'200'};
+	foreach my $sf ( qw/a b c/ ) {
+		ok( frec_eq( '200' => $sf, '900' => $sf ), "frec_eq 200 == 900 $sf");
+		ok( ! frec_ne( '200' => $sf, '900' => $sf ), "! frec_ne 200 == 900 $sf");
+	}
+
+	foreach my $sf ( qw/a b/ ) {
+		ok( ! frec_eq( '200' => $sf, '200' => 'c' ), "! frec_eq 200 $sf == 200 c");
+		ok( frec_ne( '200' => $sf, '200' => 'c' ), "frec_ne 200 $sf == 200 c");
+	}
+
 	# marc_template
 
 	test_rec_rules(
@@ -889,6 +917,14 @@
 				'v' => 'v-4-1',
 				'i' => 'i-4-1',
 				'w' => 'w-4-1',
+			},{
+				'a' => 'a-4-1',
+				'v' => 'v-4-1',
+				'i' => 'i-4-1',
+			},{
+				'a' => 'a-4-1',
+				'i' => 'i-4-1',
+				'w' => 'w-4-1',
 			}],
 		},
 		qq{
@@ -902,30 +938,23 @@
 					'i' => 'p',
 					'w' => 'v',
 				],
+				isis_template => [
+					'a ; |v. |i',
+					'a. |i ; |w',
+				],
 				marc_template => [
+					'a',
 					'a, |x ; |v. |n, |p ; |v',
 					'a ; |v. |p ; |v',
-					'a. |p ; |v',
 				],
 			);
 		},
 		[
-			[440, " ", " ",
-				["a", "a-1-1"],
-				["x", "x-1-1"],
-				["v", "v-1-1"],
-				["n", "h-1-1"],
-				["p", "i-1-1"],
-				["v", "w-1-1"],
-			],
-			[440, " ", " ", ["a", "a-2-1"], ["p", "i-2-1"], ["v", "v-2-1"]],
-			[440, " ", " ", ["a", "a-3-1"], ["p", "i-3-1"], ["v", "v-3-1"]],
-			[440, " ", " ",
-				["a", "a-4-1"],
-				["v", "v-4-1"],
-				["p", "i-4-1"],
-				["v", "w-4-1"],
-			],
+			[440, " ", " ", "a", "a-1-1", "x", "x-1-1", "v", "v-1-1", "n", "h-1-1", "p", "i-1-1", "v", "w-1-1", ],
+			[440, " ", " ", "a", "a-2-1", "p", "i-2-1", "v", "v-2-1"],
+			[440, " ", " ", "a", "a-3-1", "p", "i-3-1", "v", "v-3-1"],
+			[440, " ", " ", "a", "a-4-1", "v", "v-4-1", "p", "i-4-1", "v", "w-4-1"],
+			[440, " ", " ", "a", "a-5-1"],
 		],
 	);
 }