--- trunk/run.pl	2007/08/23 20:28:10	882
+++ trunk/run.pl	2007/10/30 20:32:16	916
@@ -9,7 +9,7 @@
 use WebPAC::Common 0.02;
 use WebPAC::Parser 0.08;
 use WebPAC::Input 0.16;
-use WebPAC::Store 0.14;
+use WebPAC::Store 0.15;
 use WebPAC::Normalize 0.22;
 use WebPAC::Output::TT;
 use WebPAC::Validate 0.11;
@@ -255,10 +255,7 @@
 
 		} elsif ($use_indexer eq 'kinosearch') {
 
-			# open KinoSearch
-			require WebPAC::Output::KinoSearch;
-			$indexer_config->{clean} = 1 unless (-e $indexer_config->{index_path});
-			$indexer = new WebPAC::Output::KinoSearch( %{ $indexer_config } );
+			die "no longer supported";
 
 		} else {
 			$log->logdie("unknown use_indexer: $use_indexer");
@@ -298,22 +295,9 @@
 	#
 	# now WebPAC::Store
 	#
-	my $abs_path = abs_path($0);
-	$abs_path =~ s#/[^/]*$#/#;	#
-
-	my $db_path = $config->webpac('db_path');
-
-	if ($clean) {
-		$log->info("creating new database '$database' in $db_path");
-		rmtree( $db_path ) || $log->warn("can't remove $db_path: $!");
-	} else {
-		$log->info("working on database '$database' in $db_path");
-	}
-
-	my $store = new WebPAC::Store(
-		path => $db_path,
+	my $store = new WebPAC::Store({
 		debug => $debug,
-	);
+	});
 
 	#
 	# prepare output
@@ -324,6 +308,8 @@
 		$module = 'WebPAC::Output::' . $module unless $module =~ m/::/;
 		$log->debug("loading output module $module");
 		eval "require $module";
+		$db_config->{output}->{database} = $database;
+		$log->debug("calling $module->new(",dump( $db_config->{output} ),")");
 		my $out = new $module->new( $db_config->{output} );
 		$out->init;
 		push @outputs, $out;
@@ -585,9 +571,7 @@
 			}
 
 			foreach my $out ( @outputs ) {
-				if ( $out->can('add') ) {
-					$out->add( $mfn, $ds );
-				}
+				$out->add( $mfn, $ds ) if $out->can('add');
 			}
 
 		}
@@ -620,6 +604,10 @@
 
 	eval { $indexer->finish } if ($indexer && $indexer->can('finish'));
 
+	foreach my $out ( @outputs ) {
+		$out->finish if $out->can('finish');
+	}
+
 	my $dt = time() - $start_t;
 	$log->info("$total_rows records ", $indexer ? "indexed " : "",
 		sprintf("in %.2f sec [%.2f rec/sec]",