--- trunk/run.pl	2007/05/27 16:49:15	857
+++ trunk/run.pl	2007/06/21 21:26:17	868
@@ -185,7 +185,7 @@
 if ($stats) {
 	$log->debug("disabled indexing for stats collection");
 	$use_indexer = undef;
-} else {
+} elsif ( $use_indexer ) {
 	$log->info("using $use_indexer indexing engine...");
 }
 
@@ -244,19 +244,19 @@
 		if ($use_indexer eq 'hyperestraier') {
 
 			# open Hyper Estraier database
-			use WebPAC::Output::Estraier '0.10';
+			require WebPAC::Output::Estraier;
 			$indexer = new WebPAC::Output::Estraier( %{ $indexer_config } );
 		
 		} elsif ($use_indexer eq 'hyperestraier-native') {
 
 			# open Hyper Estraier database
-			use WebPAC::Output::EstraierNative;
+			require WebPAC::Output::EstraierNative;
 			$indexer = new WebPAC::Output::EstraierNative( %{ $indexer_config } );
 
 		} elsif ($use_indexer eq 'kinosearch') {
 
 			# open KinoSearch
-			use WebPAC::Output::KinoSearch;
+			require WebPAC::Output::KinoSearch;
 			$indexer_config->{clean} = 1 unless (-e $indexer_config->{index_path});
 			$indexer = new WebPAC::Output::KinoSearch( %{ $indexer_config } );
 
@@ -264,7 +264,7 @@
 			$log->logdie("unknown use_indexer: $use_indexer");
 		}
 
-		$log->logide("can't continue without valid indexer") unless ($indexer);
+		$log->logdie("can't continue without valid indexer") unless ($indexer);
 	}
 
 
@@ -362,6 +362,7 @@
 			stats => $stats,
 			modify_records => $input->{modify_records},
 			modify_file => $input->{modify_file},
+			input_config => $input,
 		);
 		$log->logdie("can't create input using $input_module") unless ($input);
 
@@ -448,8 +449,8 @@
 			$log->info("Generating report file $path");
 
 			if ( $validate ) {
-				$validate->read_validate_file( $validate->fill_in( $validate_path, database => $database, input => $input_name ) );
-				$validate->read_validate_delimiters_file( $validate->fill_in( $validate_delimiters_path, database => $database, input => $input_name ) );
+				$validate->read_validate_file( $validate->fill_in( $validate_path, database => $database, input => $input_name ) ) if ( $validate_path );
+				$validate->read_validate_delimiters_file( $validate->fill_in( $validate_delimiters_path, database => $database, input => $input_name ) ) if ( $validate_delimiters_path );
 			}
 		}
 
@@ -621,7 +622,7 @@
 }
 
 # save new delimiters if needed
-$validate->save_delimiters_templates if ( $validate );
+$validate->save_delimiters_templates if ( $validate_delimiters_path );
 
 #
 # handle links or merge after indexing