r1413@llin: dpavlin | 2007-10-31 13:13:58 +0100

[webpac2] / run.pl

diff --git a/run.pl b/run.pl
index fa58e14..c974a5c 100755 (executable)
--- a/run.pl
+++ b/run.pl
@@ -299,20 +299,34 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                debug => $debug,
        });
 
+
        #
        # 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 = force_array( $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";
-               $db_config->{output}->{database} = $database;
-               $log->debug("calling $module->new(",dump( $db_config->{output} ),")");
-               my $out = new $module->new( $db_config->{output} );
+
+               # add database to arugemnts for output filter
+               $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;
        }
 
 
@@ -320,14 +334,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 = force_array( $db_config->{input}, sub {
                $log->info("database $database doesn't have inputs defined");
-       }
+       } );
 
        foreach my $input (@inputs) {
 
@@ -499,6 +509,16 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                }
 
 
+               # setup input name for all output filters
+               foreach my $out ( @output_modules ) {
+                       if ( $out->can('input') ) {
+                               $out->input( $input_name );
+                       } else {
+                               $log->warn("output filter $out doesn't support input name");
+                       }
+               }
+
+
                foreach my $pos ( 0 ... $input_db->size ) {
 
                        my $row = $input_db->fetch || next;
@@ -570,7 +590,7 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                                $log->info("Created $i instances of MFN $mfn\n") if ($i > 1);
                        }
 
-                       foreach my $out ( @outputs ) {
+                       foreach my $out ( @output_modules ) {
                                $out->add( $mfn, $ds ) if $out->can('add');
                        }
 
@@ -604,7 +624,7 @@ foreach my $database ( sort keys %{ $config->databases } ) {
 
        eval { $indexer->finish } if ($indexer && $indexer->can('finish'));
 
-       foreach my $out ( @outputs ) {
+       foreach my $out ( @output_modules ) {
                $out->finish if $out->can('finish');
        }