--- trunk/run.pl 2007/11/02 10:54:42 956 +++ trunk/run.pl 2007/11/02 14:28:43 969 @@ -133,7 +133,7 @@ "clean" => \$clean, "one=s" => \$only_filter, "only=s" => \$only_filter, - "config" => \$config_path, + "config=s" => \$config_path, "debug+" => \$debug, "stats" => \$stats, "validate=s" => \$validate_path, @@ -311,7 +311,7 @@ foreach my $output ( @outputs ) { -warn '## output = ',dump( $output ); +#warn '## output = ',dump( $output ); my $module = $output->{module} || $log->logdie("need module in output section of $database"); $module = 'WebPAC::Output::' . $module unless $module =~ m/::/; @@ -347,9 +347,16 @@ my $type = lc($input->{type}); - die "I know only how to handle input types ", join(",", $config->webpac('inputs') ), " not '$type'!\n" unless (grep(/$type/, $config->webpac('inputs'))); + # FIXME check if input module exists + my $input_module = $input->{module}; - my $input_module = $config->webpac('inputs')->{$type}; + if ( ! $input_module ) { + if ( grep(/$type/, $config->webpac('inputs')) ) { + $input_module = $config->webpac('inputs')->{$type}; + } else { + $log->logdie("I know only how to handle input types ", join(",", $config->webpac('inputs') ), " not '$type'!" ); + } + } my @lookups = $parser->have_lookup_create($database, $input);