--- trunk/t/3-normalize.t	2007/11/03 13:33:19	980
+++ trunk/t/3-normalize.t	2007/11/08 16:55:59	1014
@@ -162,7 +162,7 @@
 
 	ok(! _set_lookup( undef ), "set_lookup(undef)");
 
-	_set_rec( $rec1 );
+	_set_ds( $rec1 );
 
 	cmp_ok( join(",", rec2('200','a') ), 'eq', '200a,200a*2', 'join rec2' );
 	cmp_ok( join(",", rec2('200','a'), rec2('200','b') ), 'eq', '200a,200a*2,200b', 'join rec2 rec2' );
@@ -358,7 +358,7 @@
 
 	#ok(! lookup('non-existent'), 'lookup non-existant' );
 
-	_set_rec( $rec2 );
+	_set_ds( $rec2 );
 
 	test_s(qq{
 		search_display('Title',
@@ -445,7 +445,7 @@
 	my $rules = qq{ search('mixed', rec('200') ) };
 	
 	_clean_ds();
-	_set_rec( $rec );
+	_set_ds( $rec );
 	test_s( $rules );
 	ok($ds = _get_ds(), "get_ds");
 	is_deeply( $ds, {
@@ -462,7 +462,7 @@
 
 	# wird and non-valid structure which is supported anyway
 	_clean_ds();
-	_set_rec({
+	_set_ds({
 		'200' => [{
 			'a' => '200a',
 		},
@@ -512,12 +512,13 @@
 		my ($msg, $rec, $rules, $struct) = @_;
 
 		_clean_ds();
-		_set_rec($rec);
+		_set_ds($rec);
 
-		foreach my $r (split(/;/, $rules)) {
+		foreach my $r (split(/;\s*$/, $rules)) {
 			$r =~ s/[\s\n\r]+/ /gs;
 			$r =~ s/^\s+//gs;
 			$r =~ s/\s+$//gs;
+			diag "rule: $r" if $debug;
 			test_s($r) if ($r);
 		}
 
@@ -621,7 +622,7 @@
 	sub test_rule {
 		my ($msg, $rec, $rule, $struct) = @_;
 		_clean_ds();
-		_set_rec( $rec );
+		_set_ds( $rec );
 		$rule =~ s/\\/\\/gs;
 		my $r = test_s( $rule );
 		diag "for ", dump($rec), " got:\n", dump($r), "\nexpect:\n" if ($debug > 1);
@@ -863,5 +864,86 @@
 		[ '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' ] );
+
+	# marc_template
+
+	test_rec_rules(
+		'marc_template',
+		{
+			'225' => [{
+				'a' => 'a-1-1',
+				'i' => 'i-1-1',
+				'v' => 'v-1-1',
+				'w' => 'w-1-1',
+				'h' => 'h-1-1',
+				'x' => 'x-1-1',
+			},{
+				'a' => 'a-2-1',
+				'v' => 'v-2-1',
+				'i' => 'i-2-1',
+			},{
+				'a' => 'a-3-1',
+				'i' => 'i-3-1',
+				'v' => 'v-3-1',
+			},{
+				'a' => 'a-4-1',
+				'v' => 'v-4-1',
+				'i' => 'i-4-1',
+				'w' => 'w-4-1',
+			}],
+		},
+		qq{
+			marc_template(
+				from => 225, to => 440,
+				subfields_rename => [
+					'a' => 'a',
+					'x' => 'x',
+					'v' => 'v',
+					'h' => 'n',
+					'i' => 'p',
+					'w' => 'v',
+				],
+				marc_template => [
+					'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"],
+			],
+		],
+	);
 }