--- trunk/run.pl	2007/11/03 12:34:26	977
+++ trunk/run.pl	2007/11/12 12:35:32	1043
@@ -153,6 +153,8 @@
 
 my $config = new WebPAC::Config( path => $config_path );
 
+WebPAC::Normalize::_debug( $debug - 1 ) if $debug > 1;
+
 #print "config = ",dump($config) if ($debug);
 
 die "no databases in config file!\n" unless ($config->databases);
@@ -563,7 +565,7 @@
 				marc_encoding => 'utf-8',
 				load_row_coderef => sub {
 					my ($database,$input,$mfn) = @_;
-warn "### load_row($database,$input,$mfn) from data_structure\n";
+#warn "### load_row($database,$input,$mfn) from data_structure\n";
 					return $store->load_row(
 						database => $database,
 						input => $input,
@@ -600,11 +602,11 @@
 			if ($marc) {
 				my $i = 0;
 
-				while (my $fields = WebPAC::Normalize::_get_marc_fields( fetch_next => 1 ) ) {
+				while (my $fields = WebPAC::Normalize::MARC::_get_marc_fields( fetch_next => 1 ) ) {
 					$marc->add(
 						id => $mfn . ( $i ? "/$i" : '' ),
 						fields => $fields,
-						leader => WebPAC::Normalize::_get_marc_leader(),
+						leader => WebPAC::Normalize::MARC::_get_marc_leader(),
 						row => $row,
 					);
 					$i++;