--- trunk/run.pl	2006/05/15 13:15:01	507
+++ trunk/run.pl	2006/05/18 13:48:58	520
@@ -14,6 +14,7 @@
 use WebPAC::Normalize::XML;
 use WebPAC::Normalize::Set;
 use WebPAC::Output::TT;
+use WebPAC::Validate;
 use YAML qw/LoadFile/;
 use Getopt::Long;
 use File::Path;
@@ -42,22 +43,30 @@
 
 remove database and Hyper Estraier index before indexing
 
-=item --only=database_name
+=item --only=database_name/input_filter
 
 reindex just single database (legacy name is --one)
 
+C</input_filter> is optional part which can be C<name>
+or C<type> from input
+
 =item --config conf/config.yml
 
 path to YAML configuration file
 
 =item --force-set
 
-force conversion C<normalize->path> in C<config.yml> from
+force conversion C<< normalize->path >> in C<config.yml> from
 C<.xml> to C<.pl>
 
 =item --stats
 
-dump statistics about used fields and subfields in each input
+disable indexing and dump statistics about field and subfield
+usage for each input
+
+=item --validate path/to/validation_file
+
+turn on extra validation of imput records, see L<WebPAC::Validation>
 
 =back
 
@@ -69,20 +78,22 @@
 my $clean = 0;
 my $config = 'conf/config.yml';
 my $debug = 0;
-my $only_db_name;
+my $only_filter;
 my $force_set = 0;
 my $stats = 0;
+my $validate_path;
 
 GetOptions(
 	"limit=i" => \$limit,
 	"offset=i" => \$offset,
 	"clean" => \$clean,
-	"one=s" => \$only_db_name,
-	"only=s" => \$only_db_name,
+	"one=s" => \$only_filter,
+	"only=s" => \$only_filter,
 	"config" => \$config,
 	"debug" => \$debug,
 	"force-set" => \$force_set,
 	"stats" => \$stats,
+	"validate=s" => \$validate_path,
 );
 
 $config = LoadFile($config);
@@ -92,42 +103,57 @@
 die "no databases in config file!\n" unless ($config->{databases});
 
 my $log = _new WebPAC::Common()->_get_logger();
+$log->info( "-" x 79 );
+
+my $validate;
+$validate = new WebPAC::Validate(
+	path => $validate_path,
+) if ($validate_path);
 
 my $use_indexer = $config->{use_indexer} || 'hyperestraier';
-$log->info("using $use_indexer indexing engine...");
+if ($stats) {
+	$log->debug("option --stats disables update of indexing engine...");
+	$use_indexer = undef;
+} else {
+	$log->info("using $use_indexer indexing engine...");
+}
 
 my $total_rows = 0;
 my $start_t = time();
 
 while (my ($database, $db_config) = each %{ $config->{databases} }) {
 
-	next if ($only_db_name && $database !~ m/$only_db_name/i);
+	my ($only_database,$only_input) = split(m#/#, $only_filter) if ($only_filter);
+	next if ($only_database && $database !~ m/$only_database/i);
 
 	my $indexer;
 
-	my $indexer_config = $config->{$use_indexer} || $log->logdie("can't find '$use_indexer' part in confguration");
-	$indexer_config->{database} = $database;
-	$indexer_config->{clean} = $clean;
-	$indexer_config->{label} = $db_config->{name};
-
-	if ($use_indexer eq 'hyperestraier') {
-
-		# open Hyper Estraier database
-		use WebPAC::Output::Estraier '0.10';
-		$indexer = new WebPAC::Output::Estraier( %{ $indexer_config } );
-	
-	} elsif ($use_indexer eq 'kinosearch') {
-
-		# open KinoSearch
-		use WebPAC::Output::KinoSearch;
-		$indexer_config->{clean} = 1 unless (-e $indexer_config->{index_path});
-		$indexer = new WebPAC::Output::KinoSearch( %{ $indexer_config } );
+	if ($use_indexer) {
+		my $indexer_config = $config->{$use_indexer} || $log->logdie("can't find '$use_indexer' part in confguration");
+		$indexer_config->{database} = $database;
+		$indexer_config->{clean} = $clean;
+		$indexer_config->{label} = $db_config->{name};
+
+		if ($use_indexer eq 'hyperestraier') {
+
+			# open Hyper Estraier database
+			use WebPAC::Output::Estraier '0.10';
+			$indexer = new WebPAC::Output::Estraier( %{ $indexer_config } );
+		
+		} elsif ($use_indexer eq 'kinosearch') {
+
+			# open KinoSearch
+			use WebPAC::Output::KinoSearch;
+			$indexer_config->{clean} = 1 unless (-e $indexer_config->{index_path});
+			$indexer = new WebPAC::Output::KinoSearch( %{ $indexer_config } );
 
-	} else {
-		$log->logdie("unknown use_indexer: $use_indexer");
+		} else {
+			$log->logdie("unknown use_indexer: $use_indexer");
+		}
+
+		$log->logide("can't continue without valid indexer") unless ($indexer);
 	}
 
-	$log->logide("can't continue without valid indexer") unless ($indexer);
 
 	#
 	# now WebPAC::Store
@@ -138,10 +164,10 @@
 	my $db_path = $config->{webpac}->{db_path} . '/' . $database;
 
 	if ($clean) {
-		$log->info("creating new database $database in $db_path");
+		$log->info("creating new database '$database' in $db_path");
 		rmtree( $db_path ) || $log->warn("can't remove $db_path: $!");
 	} else {
-		$log->debug("working on $database in $db_path");
+		$log->info("working on database '$database' in $db_path");
 	}
 
 	my $db = new WebPAC::Store(
@@ -168,17 +194,19 @@
 
 	foreach my $input (@inputs) {
 
+		next if ($only_input && ($input->{name} !~ m#$only_input#i && $input->{type} !~ m#$only_input#i));
+
 		my $type = lc($input->{type});
 
 		die "I know only how to handle input types ", join(",", @supported_inputs), " not '$type'!\n" unless (grep(/$type/, @supported_inputs));
 
 		my $lookup = new WebPAC::Lookup(
 			lookup_file => $input->{lookup},
-		);
+		) if ($input->{lookup});
 
 		my $input_module = $config->{webpac}->{inputs}->{$type};
 
-		$log->info("working on input '$input->{path}' [$input->{type}] using $input_module lookup '$input->{lookup}'");
+		$log->info("working on input '$input->{name}' in $input->{path} [type: $input->{type}] using $input_module lookup '$input->{lookup}'");
 
 		my $input_db = new WebPAC::Input(
 			module => $input_module,
@@ -199,7 +227,7 @@
 		my $n = new WebPAC::Normalize::XML(
 		#	filter => { 'foo' => sub { shift } },
 			db => $db,
-			lookup_regex => $lookup->regex,
+			lookup_regex => $lookup ? $lookup->regex : undef,
 			lookup => $lookup,
 			prefix => $input->{name},
 		);
@@ -246,18 +274,35 @@
 				push @{ $row->{'000'} }, $pos;
 			}
 
-			my $ds = $n ? $n->data_structure($row) :
-				WebPAC::Normalize::Set::data_structure(
+
+			if ($validate) {
+				my @errors = $validate->validate_errors( $row );
+				$log->error( "MFN $mfn validation errors:\n", join("\n", @errors) ) if (@errors);
+			}
+
+				
+			my $ds;
+			if ($n) {
+				$ds = $n->data_structure($row);
+			} else {
+				$ds = WebPAC::Normalize::Set::data_structure(
 					row => $row,
 					rules => $rules,
-					lookup => $lookup->lookup_hash,
+					lookup => $lookup ? $lookup->lookup_hash : undef,
 				);
 
+				$db->save_ds(
+					id => $mfn,
+					ds => $ds,
+					prefix => $input->{name},
+				) if ($ds && !$stats);
+			}
+
 			$indexer->add(
 				id => $input->{name} . "/" . $mfn,
 				ds => $ds,
 				type => $config->{$use_indexer}->{type},
-			);
+			) if ($indexer);
 
 			$total_rows++;
 		}
@@ -266,11 +311,11 @@
 
 	};
 
-	eval { $indexer->finish } if ($indexer->can('finish'));
+	eval { $indexer->finish } if ($indexer && $indexer->can('finish'));
 
 	my $dt = time() - $start_t;
-	$log->info("$total_rows records indexed in " .
-		sprintf("%.2f sec [%.2f rec/sec]",
+	$log->info("$total_rows records ", $indexer ? "indexed " : "",
+		sprintf("in %.2f sec [%.2f rec/sec]",
 			$dt, ($total_rows / $dt)
 		)
 	);