--- trunk/t/3-normalize.t	2007/11/12 10:16:16	1035
+++ trunk/t/3-normalize.t	2007/11/12 11:10:48	1036
@@ -485,7 +485,7 @@
 	test_s(qq{ marc_indicators('900',1,2) });
 	test_s(qq{ marc('900','a', rec('200') ) });
 	my $marc;
-	ok($marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
+	ok($marc = WebPAC::Normalize::MARC::_get_marc_fields(), "_get_marc_fields");
 	diag dump( $marc ) if ($debug);
 
 	is_deeply( $marc, [
@@ -496,7 +496,7 @@
 	test_s(qq{ marc_indicators('900',' ',9) });
 	test_s(qq{ marc_repeatable_subfield('900','a', rec('200') ) });
 
-	ok($marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
+	ok($marc = WebPAC::Normalize::MARC::_get_marc_fields(), "_get_marc_fields");
 	diag dump( $marc ) if ($debug);
 
 	is_deeply( $marc, [
@@ -522,7 +522,7 @@
 			test_s($r) if ($r);
 		}
 
-		ok(my $marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
+		ok(my $marc = WebPAC::Normalize::MARC::_get_marc_fields(), "_get_marc_fields");
 		diag dump( $marc ) if $debug;
 		diag "expects:\n", dump($struct) if ($debug > 1);
 		is_deeply( $marc, $struct, $msg );
@@ -732,7 +732,7 @@
 	);
 
 	test_s(qq{ marc_remove('*'); });
-	ok(! WebPAC::Normalize::_get_marc_fields(), 'marc_remove(*)');
+	ok(! WebPAC::Normalize::MARC::_get_marc_fields(), 'marc_remove(*)');
 
 	test_rec_rules(
 		'marc_duplicate',
@@ -766,7 +766,7 @@
 	my $i = 0;
 	foreach my $v ( qw/bar baz bing bong/ ) {
 
-		ok($marc = WebPAC::Normalize::_get_marc_fields( offset => $i ),
+		ok($marc = WebPAC::Normalize::MARC::_get_marc_fields( offset => $i ),
 			"_get_marc_fields( offset => $i )"
 		);
 		diag "marc $i = ", dump( $marc ) if ($debug);
@@ -774,7 +774,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");
+		is_deeply(WebPAC::Normalize::MARC::_get_marc_leader(), { '06' => 42, 11 => $i }, "_get_marc_leader copy $i");
 		$i++;
 	}
 
@@ -841,9 +841,9 @@
 		marc_fixed('000', 10, 'A');
 		marc_fixed('000', 0, '0');
 	});
-	ok( my $m = WebPAC::Normalize::_get_marc_fields(), '_get_marc_fields');
+	ok( my $m = WebPAC::Normalize::MARC::_get_marc_fields(), '_get_marc_fields');
 	diag dump( $m );
-	is_deeply( WebPAC::Normalize::_get_marc_fields(),
+	is_deeply( WebPAC::Normalize::MARC::_get_marc_fields(),
 		[
 			["008", "abcdef"], 
 			#        0....5....10