r1393@llin: dpavlin | 2007-10-31 00:52:52 +0100

[webpac2] / run.pl

diff --git a/run.pl b/run.pl
index 27fc11f..03de8b3 100755 (executable)
--- a/run.pl
+++ b/run.pl
@@ -9,7 +9,7 @@ use lib './lib';
 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 @@ foreach my $database ( sort keys %{ $config->databases } ) {
 
                } 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,35 +295,49 @@ foreach my $database ( sort keys %{ $config->databases } ) {
        #
        # 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,
-       );
+       });
+
+       sub iterate_over {
+               my ( $what, $error ) = @_;
+               my @result;
+               if ( ref( $what ) eq 'ARRAY' ) {
+                       @result = @{ $what };
+               } elsif ($db_config->{input}) {
+                       @result =  ( $what );
+               } else {
+                       $error->() if ref($error) eq 'CODE';
+               }
+               return @result;
+       }
 
        #
        # prepare output
        #
-       my @outputs;
-       if (defined( $db_config->{output} )) {
-               my $module = $db_config->{output}->{module} || $log->logdie("need module in output section of $database");
+       my @outputs = iterate_over( $db_config->{output}, sub {
+               $log->error("Database $database doesn't have any outputs defined. Do you want to remove it from configuration?" );
+       } );
+
+       my @output_modules;
+
+       foreach my $output ( @outputs ) {
+
+warn '## output = ',dump( $output );
+
+               my $module = $output->{module} || $log->logdie("need module in output section of $database");
                $module = 'WebPAC::Output::' . $module unless $module =~ m/::/;
+       
                $log->debug("loading output module $module");
                eval "require $module";
-               my $out = new $module->new( $db_config->{output} );
+       
+               $output->{database} = $database;
+
+               $log->debug("calling $module->new(",dump( $output ),")");
+               my $out = new $module->new( $output );
                $out->init;
-               push @outputs, $out;
+
+               push @output_modules, $out;
        }
 
 
@@ -334,14 +345,10 @@ foreach my $database ( sort keys %{ $config->databases } ) {
        # now, iterate through input formats
        #
 
-       my @inputs;
-       if (ref($db_config->{input}) eq 'ARRAY') {
-               @inputs = @{ $db_config->{input} };
-       } elsif ($db_config->{input}) {
-               push @inputs, $db_config->{input};
-       } else {
+
+       my @inputs = iterate_over( $db_config->{input}, sub {
                $log->info("database $database doesn't have inputs defined");
-       }
+       } );
 
        foreach my $input (@inputs) {
 
@@ -584,10 +591,8 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                                $log->info("Created $i instances of MFN $mfn\n") if ($i > 1);
                        }
 
-                       foreach my $out ( @outputs ) {
-                               if ( $out->can('add') ) {
-                                       $out->add( $mfn, $ds );
-                               }
+                       foreach my $out ( @output_modules ) {
+                               $out->add( $mfn, $ds ) if $out->can('add');
                        }
 
                }
@@ -620,6 +625,10 @@ foreach my $database ( sort keys %{ $config->databases } ) {
 
        eval { $indexer->finish } if ($indexer && $indexer->can('finish'));
 
+       foreach my $out ( @output_modules ) {
+               $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]",