--- trunk/run.pl 2007/08/23 20:28:10 882 +++ trunk/run.pl 2007/09/03 15:26:46 887 @@ -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; @@ -298,22 +298,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 @@ -585,9 +572,7 @@ } foreach my $out ( @outputs ) { - if ( $out->can('add') ) { - $out->add( $mfn, $ds ); - } + $out->add( $mfn, $ds ) if $out->can('add'); } } @@ -620,6 +605,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]",