--- trunk/t/3-normalize.t	2006/10/05 12:57:51	736
+++ trunk/t/3-normalize.t	2007/11/03 13:33:19	980
@@ -1,25 +1,15 @@
 #!/usr/bin/perl -w
 
 use strict;
-
-use Test::More tests => 309;
-use Test::Exception;
-use Cwd qw/abs_path/;
 use blib;
-use File::Slurp;
-use Getopt::Long;
+
+use Test::More tests => 351;
 
 BEGIN {
+	use_ok( 'WebPAC::Test' );
 	use_ok( 'WebPAC::Normalize' );
 }
 
-use Data::Dump qw/dump/;
-
-my $debug = 0;
-GetOptions(
-	"debug+", \$debug
-);
-
 cmp_ok(_debug(1), '==', 1, '_debug level');
 cmp_ok(_debug(0), '==', 0, '_debug level');
 
@@ -28,10 +18,6 @@
 	diag "debug level for WebPAC::Normalize is ", _debug( $debug - 2 );
 }
 
-ok(my $abs_path = abs_path($0), "abs_path");
-$abs_path =~ s#/[^/]*$#/#;
-diag "abs_path: $abs_path" if ($debug);
-
 my $rec1 = {
 	'200' => [{
 		'a' => '200a',
@@ -191,8 +177,23 @@
 
 	# 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;
+	for my $i ( 0 .. 10 ) {
+		cmp_ok( count( @el ), '==', $i, "count($i)");
+		push @el, "element $i";
+	}
 
 	# lookups
 
@@ -200,7 +201,7 @@
 
 	ok(_set_load_row(sub {
 		my ($database,$input,$mfn) = @_;
-		diag "load_row( $database, $input, $mfn )";
+		diag "load_row( $database, $input, $mfn )" if ($debug);
 		cmp_ok( $#_, '==', 2, 'have 3 arguments');
 		ok($database, '_load_row database');
 		ok($input, '_load_row input');
@@ -229,13 +230,13 @@
 		);
 
 		ok(my $l = WebPAC::Normalize::_get_lookup(), '_get_lookup');
-		diag "_get_lookup = ", dump($l);
+		diag "_get_lookup = ", dump($l) if ($debug);
 
 		my @lookup;
 
 		ok(@lookup = lookup(
 				sub {
-					diag "in show";
+					diag "in show" if ($debug);
 					rec('900','x');
 				},
 				'db','input','key',
@@ -254,7 +255,7 @@
 	}
 
 	ok(my $l = WebPAC::Normalize::_get_lookup(), '_get_lookup');
-	diag "_get_lookup = ", dump($l);
+	diag "_get_lookup = ", dump($l) if ($debug);
 
 	is_deeply( $l, {
 		db => {
@@ -274,7 +275,7 @@
 
 #######
 
-	diag "lookup_hash1 = ", dump($lookup_hash1);
+	diag "lookup_hash1 = ", dump($lookup_hash1) if ($debug);
 	ok(_set_lookup( $lookup_hash1 ), '_set_lookup $lookup_hash1');
 
 	throws_ok { _set_load_row() } qr/CODE/, 'empty _set_load_row()';
@@ -360,12 +361,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')
@@ -416,12 +417,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";
@@ -445,7 +451,6 @@
 	is_deeply( $ds, {
 		'mixed' => {
 			'search' => [ '200a', '200b' ],
-			'tag' => 'mixed'
 		}
 	}, 'correct get_ds');
 
@@ -469,7 +474,6 @@
 	is_deeply( $ds, {
 		'mixed' => {
 			'search' => [ '200a', '200-solo' ],
-			'tag' => 'mixed'
 		}
 	}, 'correct get_ds');
 
@@ -725,19 +729,28 @@
 			[ '901', ' ', ' ', 'b', 'bar', 'c', 'baz' ],
 		],
 	);
+
+	test_s(qq{ marc_remove('*'); });
+	ok(! WebPAC::Normalize::_get_marc_fields(), 'marc_remove(*)');
+
 	test_rec_rules(
 		'marc_duplicate',
 		{ '200' => [{ a => 42, b => 'bar', c => 'baz', d => 'bing', e => 'bong' }] },
 		qq{
+			marc_leader('06',42);
+			marc_leader('11',0);
 			marc('900', 'a', rec('200','a') );
 			marc('900', 'b', rec('200','b') );
 			marc_duplicate;
+			marc_leader('11',1);
 			marc_remove('900','b');
 			marc('900', 'b', rec('200','c') );
 			marc_duplicate;
+			marc_leader('11',2);
 			marc_remove('900','b');
 			marc('900', 'b', rec('200','d') );
 			marc_duplicate;
+			marc_leader('11',3);
 			marc_remove('900','b');
 			marc('900', 'b', rec('200','e') );
 		},
@@ -747,6 +760,8 @@
 		],
 	);
 
+	cmp_ok( marc_count(), '==', 3, 'marc_count' );
+
 	my $i = 0;
 	foreach my $v ( qw/bar baz bing bong/ ) {
 
@@ -758,6 +773,7 @@
 			[ [ '900', ' ', ' ', 'a', 42, 'b', $v ] ],
 			"MARC copy $i has $v",
 		);
+		is_deeply(WebPAC::Normalize::_get_marc_leader(), { '06' => 42, 11 => $i }, "_get_marc_leader copy $i");
 		$i++;
 	}
 
@@ -816,5 +832,36 @@
 		'^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"]
+		]
+	);
+
+	test_s(qq{ isbn_13( '1558607013', '978-1558607019' ) });
+	test_s(qq{ isbn_10( '1558607013', '978-1558607019' ) });
+
+	is_deeply(
+		[ isbn_13( '1558607013', '978-1558607019' ) ],
+		[ '978-1-55860-701-9', '978-1-55860-701-9', ],
+	'isbn_13' );
+
+	is_deeply(
+		[ isbn_10( '1558607013', '978-1558607019' ) ],
+		[ '1-55860-701-3', '1-55860-701-3' ],
+	'isbn_10' );
+
 }