--- trunk/t/3-normalize.t	2006/06/26 16:39:51	536
+++ trunk/t/3-normalize.t	2006/06/29 15:29:19	538
@@ -144,9 +144,9 @@
 	no strict 'subs';
 	use WebPAC::Normalize;
 
-	ok(! set_lookup( undef ), "set_lookup(undef)");
+	ok(! _set_lookup( undef ), "set_lookup(undef)");
 
-	set_rec( $rec1 );
+	_set_rec( $rec1 );
 
 	cmp_ok( join(",", rec2('200','a') ), 'eq', '200a,200a*2', 'join rec2' );
 	cmp_ok( join(",", rec2('200','a'), rec2('200','b') ), 'eq', '200a,200a*2,200b', 'join rec2 rec2' );
@@ -165,7 +165,7 @@
 	cmp_ok( join('', surround('->', '<-', 'a','b','c') ), 'eq', '->a<-->b<-->c<-', 'surround');
 
 
-	set_lookup( $lookup1 );
+	_set_lookup( $lookup1 );
 	
 	cmp_ok(
 		join_with(" i ",
@@ -219,13 +219,13 @@
 
 	# test lookups
 
-	set_lookup( $lookup2 );
+	_set_lookup( $lookup2 );
 
 	is_deeply( \[ lookup( prefix( '00', rec('902') ) ) ], \[ 'lookup' ], 'lookup prefix' );
 
 	ok(! lookup('non-existent'), 'lookup non-existant' );
 
-	set_rec( $rec2 );
+	_set_rec( $rec2 );
 
 	test_s(qq{
 		tag('Title',
@@ -255,7 +255,7 @@
 		)
 	});
 
-	ok(my $ds = get_ds(), "get_ds");
+	ok(my $ds = _get_ds(), "get_ds");
 	diag "ds = ", Dumper($ds) if ($debug);
 
 
@@ -263,7 +263,7 @@
 
 		my $t = shift;
 
-		ok($ds = get_ds(), 'get_ds');
+		ok($ds = _get_ds(), 'get_ds');
 		diag Dumper( $ds ) if ($debug);
 
 		ok( $ds && $ds->{something}, 'get_ds->something exists' );
@@ -273,29 +273,29 @@
 		return $ds;
 	}
 
-	clean_ds();
+	_clean_ds();
 	test_s(qq{ search('something', '42'); });
 	test_s(qq{ search('empty', ''); });
 	test_check_ds('search');
 
-	clean_ds();
+	_clean_ds();
 	test_s(qq{ display('something', '42'); });
 	test_s(qq{ display('empty', ''); });
 	test_check_ds('display');
 
-	clean_ds();
+	_clean_ds();
 	test_s(qq{ tag('something', '42'); });
 	test_s(qq{ tag('empty', ''); });
 	test_check_ds('search');
 	test_check_ds('display');
 
-	clean_ds();
+	_clean_ds();
 	my $n = read_file( "$abs_path/data/normalize.pl" );
 	$n .= "\n1;\n";
 	#diag "normalize code:\n$n\n";
 	test_s( $n );
 
-	ok($ds = get_ds(), "get_ds");
+	ok($ds = _get_ds(), "get_ds");
 	diag "ds = ", Dumper($ds) if ($debug);
 
 	my $rec = {
@@ -306,10 +306,10 @@
 	};
 	my $rules = qq{ search('mixed', rec('200') ) };
 	
-	clean_ds();
-	set_rec( $rec );
+	_clean_ds();
+	_set_rec( $rec );
 	test_s( $rules );
-	ok($ds = get_ds(), "get_ds");
+	ok($ds = _get_ds(), "get_ds");
 	is_deeply( $ds, {
 		'mixed' => {
 			'search' => [ '200a', '200b' ],
@@ -324,8 +324,8 @@
 	is_deeply( $ds, $ds2, 'data_structure(s) same');
 
 	# wird and non-valid structure which is supported anyway
-	clean_ds();
-	set_rec({
+	_clean_ds();
+	_set_rec({
 		'200' => [{
 			'a' => '200a',
 		},
@@ -333,7 +333,7 @@
 		]
 	});
 	test_s(qq{ search('mixed', rec('200') ) });
-	ok($ds = get_ds(), "get_ds");
+	ok($ds = _get_ds(), "get_ds");
 	is_deeply( $ds, {
 		'mixed' => {
 			'search' => [ '200a', '200-solo' ],