--- trunk/run.pl	2007/06/19 10:06:36	865
+++ trunk/run.pl	2007/06/21 12:53:41	866
@@ -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);
 	}