--- trunk/run.pl	2006/10/25 18:54:45	762
+++ trunk/run.pl	2006/11/03 20:56:21	774
@@ -8,7 +8,7 @@
 
 use WebPAC::Common 0.02;
 use WebPAC::Parser 0.08;
-use WebPAC::Input 0.14;
+use WebPAC::Input 0.16;
 use WebPAC::Store 0.14;
 use WebPAC::Normalize 0.22;
 use WebPAC::Output::TT;
@@ -153,8 +153,9 @@
 
 
 my $use_indexer = $config->use_indexer;
+$stats ||= $validate;
 if ($stats) {
-	$log->debug("option --stats disables update of indexing engine...");
+	$log->debug("disabled indexing for stats collection");
 	$use_indexer = undef;
 } else {
 	$log->info("using $use_indexer indexing engine...");
@@ -396,7 +397,7 @@
 		my $lookup_data = WebPAC::Normalize::_get_lookup();
 
 		if (defined( $lookup_data->{$database}->{$input_name} )) {
-			$log->debug("created following lookups: ", dump( $lookup_data ));
+			$log->debug("created following lookups: ", sub { dump( $lookup_data ) } );
 
 			foreach my $key (keys %{ $lookup_data->{$database}->{$input_name} }) {
 				$store->save_lookup(
@@ -467,6 +468,8 @@
 
 			my $row = $input_db->fetch || next;
 
+			$total_rows++;
+
 			my $mfn = $row->{'000'}->[0];
 
 			if (! $mfn || $mfn !~ m#^\d+$#) {
@@ -477,11 +480,12 @@
 
 
 			if ($validate) {
-				if ( my $errors = $validate->validate_errors( $row, $input_db->dump ) ) {
+				if ( my $errors = $validate->validate_rec( $row, $input_db->dump_ascii ) ) {
 					$log->error( "MFN $mfn validation error:\n",
 						$validate->report_error( $errors )
 					);
 				}
+				next;	# validation doesn't create any output
 			}
 
 			my $ds = WebPAC::Normalize::data_structure(
@@ -500,7 +504,7 @@
 				},
 			);
 
-			$log->debug("ds = ",dump($ds)) if ($ds);
+			$log->debug("ds = ", sub { dump($ds) }) if ($ds);
 
 			$store->save_ds(
 				database => $database,
@@ -530,8 +534,6 @@
 
 				$log->info("Created $i instances of MFN $mfn\n") if ($i > 1);
 			}
-
-			$total_rows++;
 		}
 
 		if ($validate) {