--- trunk/t/3-normalize.t	2007/11/07 09:19:29	1012
+++ trunk/t/3-normalize.t	2007/11/07 11:54:34	1013
@@ -514,10 +514,11 @@
 		_clean_ds();
 		_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);
 		}
 
@@ -863,5 +864,69 @@
 		[ '1-55860-701-3', '1-55860-701-3' ],
 	'isbn_10' );
 
+	# 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"],
+			],
+		],
+	);
 }