--- trunk/run.pl	2007/10/30 22:46:51	920
+++ trunk/run.pl	2007/10/30 23:32:58	921
@@ -299,20 +299,45 @@
 		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";
-		$db_config->{output}->{database} = $database;
-		$log->debug("calling $module->new(",dump( $db_config->{output} ),")");
-		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;
 	}
 
 
@@ -320,14 +345,10 @@
 	# 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) {
 
@@ -570,7 +591,7 @@
 				$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 +625,7 @@
 
 	eval { $indexer->finish } if ($indexer && $indexer->can('finish'));
 
-	foreach my $out ( @outputs ) {
+	foreach my $out ( @output_modules ) {
 		$out->finish if $out->can('finish');
 	}