--- trunk/t/3-normalize.t	2007/04/01 21:47:47	813
+++ trunk/t/3-normalize.t	2007/10/31 00:26:43	923
@@ -2,7 +2,7 @@
 
 use strict;
 
-use Test::More tests => 332;
+use Test::More tests => 347;
 use Test::Exception;
 use Cwd qw/abs_path/;
 use blib;
@@ -191,8 +191,16 @@
 
 	# simple list manipulatons
 	cmp_ok( join('', prefix('ab', 'cd') ), 'eq', 'abcd', 'prefix');
+	cmp_ok( join('-', prefix('', 'x', 'y') ), 'eq', 'x-y', 'prefix empty');
+	cmp_ok( join('-', prefix(0, 'x', 'y') ), 'eq', '0x-0y', 'prefix 0');
+
 	cmp_ok( join('', suffix('xy', 'cd') ), 'eq', 'cdxy', 'suffix');
+	cmp_ok( join('-', suffix('', 'x', 'y' ) ), 'eq', 'x-y', 'suffix empty');
+	cmp_ok( join('-', suffix(0, 'x', 'y' ) ), 'eq', 'x0-y0', 'suffix 0');
+
 	cmp_ok( join('', surround('->', '<-', 'a','b','c') ), 'eq', '->a<-->b<-->c<-', 'surround');
+	cmp_ok( join('-', surround('', '', 'x','y','z') ), 'eq', 'x-y-z', 'surround empty');
+	cmp_ok( join('-', surround(0, 0, 'x','y','z') ), 'eq', '0x0-0y0-0z0', 'surround 0 0');
 
 	# count
 	my @el;
@@ -367,12 +375,12 @@
 	_set_rec( $rec2 );
 
 	test_s(qq{
-		tag('Title',
+		search_display('Title',
 			rec('200','a')
 		);
 	});
 	test_s(qq{
-		tag('Who',
+		search_display('Who',
 			join_with(" ",
 				rec('702','a'),
 				rec('702','b')
@@ -423,12 +431,17 @@
 	test_check_ds('display');
 
 	_clean_ds();
-	test_s(qq{ tag('something', '42'); });
-	test_s(qq{ tag('empty', ''); });
+	test_s(qq{ search_display('something', '42'); });
+	test_s(qq{ search_display('empty', ''); });
 	test_check_ds('search');
 	test_check_ds('display');
 
 	_clean_ds();
+	test_s(qq{ sorted('something', '42'); });
+	test_s(qq{ sorted('empty', ''); });
+	test_check_ds('sorted');
+
+	_clean_ds();
 	my $n = read_file( "$abs_path/data/normalize.pl" );
 	$n .= "\n1;\n";
 	#diag "normalize code:\n$n\n";
@@ -452,7 +465,6 @@
 	is_deeply( $ds, {
 		'mixed' => {
 			'search' => [ '200a', '200b' ],
-			'tag' => 'mixed'
 		}
 	}, 'correct get_ds');
 
@@ -476,7 +488,6 @@
 	is_deeply( $ds, {
 		'mixed' => {
 			'search' => [ '200a', '200-solo' ],
-			'tag' => 'mixed'
 		}
 	}, 'correct get_ds');
 
@@ -835,5 +846,22 @@
 		'^aa1^bb1^aa2^bb2^cc1^cc2',
 		'_pack_subfields_hash( $h, 1 )'
 	);
+
+	_clean_ds();
+	test_s(qq{
+		marc_fixed('008', 0, 'abcdef');
+		marc_fixed('000', 5, '5');
+		marc_fixed('000', 10, 'A');
+		marc_fixed('000', 0, '0');
+	});
+	ok( my $m = WebPAC::Normalize::_get_marc_fields(), '_get_marc_fields');
+	diag dump( $m );
+	is_deeply( WebPAC::Normalize::_get_marc_fields(),
+		[
+			["008", "abcdef"], 
+			#        0....5....10
+			["000", "0    5    A"]
+		]
+	);
 }