--- trunk/run.pl	2006/09/29 20:25:34	732
+++ trunk/run.pl	2006/11/03 20:56:21	774
@@ -7,10 +7,10 @@
 use lib './lib';
 
 use WebPAC::Common 0.02;
-use WebPAC::Parser 0.04;
-use WebPAC::Input 0.13;
-use WebPAC::Store 0.11;
-use WebPAC::Normalize 0.21;
+use WebPAC::Parser 0.08;
+use WebPAC::Input 0.16;
+use WebPAC::Store 0.14;
+use WebPAC::Normalize 0.22;
 use WebPAC::Output::TT;
 use WebPAC::Validate 0.06;
 use WebPAC::Output::MARC;
@@ -67,17 +67,9 @@
 
 turn on extra validation of imput records, see L<WebPAC::Validation>
 
-=item --marc-normalize conf/normalize/mapping.pl
-
-This option specifies normalisation file for MARC creation
-
-=item --marc-output out/marc/test.marc
-
-Optional path to output file
-
 =item --marc-lint
 
-By default turned on if C<--marc-normalize> is used. You can disable lint
+By default turned on if normalisation file has C<marc*> directives. You can disable lint
 messages with C<--no-marc-lint>.
 
 =item --marc-dump
@@ -110,7 +102,6 @@
 my $only_filter;
 my $stats = 0;
 my $validate_path;
-my ($marc_normalize, $marc_output);
 my $marc_lint = 1;
 my $marc_dump = 0;
 my $parallel = 0;
@@ -129,8 +120,6 @@
 	"debug+" => \$debug,
 	"stats" => \$stats,
 	"validate=s" => \$validate_path,
-	"marc-normalize=s" => \$marc_normalize,
-	"marc-output=s" => \$marc_output,
 	"marc-lint!" => \$marc_lint,
 	"marc-dump!" => \$marc_dump,
 	"parallel=i" => \$parallel,
@@ -164,16 +153,14 @@
 
 
 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...");
 }
 
-# disable indexing when creating marc
-$use_indexer = undef if ($marc_normalize);
-
 # parse normalize files and create source files for lookup and normalization
 
 my $parser = new WebPAC::Parser( config => $config );
@@ -212,7 +199,7 @@
 	}
 
 	my $indexer;
-	if ($use_indexer) {
+	if ($use_indexer && $parser->have_rules( 'search', $database )) {
 
 		my $cfg_name = $use_indexer;
 		$cfg_name =~ s/\-.*$//;
@@ -387,12 +374,30 @@
 			lookup_coderef => $lookup_coderef,
 			lookup => $lookup_jar,
 			%{ $input },
+			load_row => sub {
+				my $a = shift;
+				return $store->load_row(
+					database => $database,
+					input => $input_name,
+					id => $a->{id},
+				);
+			},
+			save_row => sub {
+				my $a = shift;
+				return $store->save_row(
+					database => $database,
+					input => $input_name,
+					id => $a->{id},
+					row => $a->{row},
+				);
+			},
+
 		);
 
 		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(
@@ -415,9 +420,9 @@
 		}
 
 		my $marc;
-		if ($marc_normalize) {
+		if ($parser->have_rules( 'marc', $database, $input_name )) {
 			$marc = new WebPAC::Output::MARC(
-				path => $marc_output || "out/marc/${database}-${input_name}.marc",
+				path => "out/marc/${database}-${input_name}.marc",
 				lint => $marc_lint,
 				dump => $marc_dump,
 			);
@@ -443,17 +448,19 @@
 			foreach my $db (keys %$depends) {
 				foreach my $i (keys %{$depends->{$db}}) {
 					foreach my $k (keys %{$depends->{$db}->{$i}}) {
+						my $t = time();
 						$log->debug("loading lookup $db/$i");
 						$lookup_hash->{$db}->{$i}->{$k} = $store->load_lookup(
 							database => $db,
 							input => $i,
 							key => $k,
 						);
+						$log->debug(sprintf("lookup $db/$i took %.2fs", time() - $t));
 					}
 				}
 			}
 
-			$log->debug("lookup_hash = ", dump( $lookup_hash ));
+			$log->debug("lookup_hash = ", sub { dump( $lookup_hash ) });
 		}
 
 
@@ -461,6 +468,8 @@
 
 			my $row = $input_db->fetch || next;
 
+			$total_rows++;
+
 			my $mfn = $row->{'000'}->[0];
 
 			if (! $mfn || $mfn !~ m#^\d+$#) {
@@ -471,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(
@@ -484,9 +494,9 @@
 				lookup => $lookup_hash,
 				config => create_ds_config( $db_config, $database, $input, $mfn ),
 				marc_encoding => 'utf-8',
-				load_ds_coderef => sub {
+				load_row_coderef => sub {
 					my ($database,$input,$mfn) = @_;
-					return $store->load_ds(
+					return $store->load_row(
 						database => $database,
 						input => $input,
 						id => $mfn,
@@ -494,6 +504,8 @@
 				},
 			);
 
+			$log->debug("ds = ", sub { dump($ds) }) if ($ds);
+
 			$store->save_ds(
 				database => $database,
 				input => $input_name,
@@ -522,8 +534,6 @@
 
 				$log->info("Created $i instances of MFN $mfn\n") if ($i > 1);
 			}
-
-			$total_rows++;
 		}
 
 		if ($validate) {