--- trunk/t/3-normalize.t	2007/11/08 17:19:50	1015
+++ 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 );
 	}
@@ -917,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{
@@ -930,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"],
 		],
 	);
 }