--- trunk/run.pl	2008/08/02 15:11:06	1098
+++ trunk/run.pl	2009/04/25 14:17:27	1160
@@ -23,7 +23,6 @@
 use Storable qw/dclone/;
 use Pod::Usage qw/pod2usage/;
 
-use Proc::Queue size => 1;
 use POSIX ":sys_wait_h"; # imports WNOHANG
 
 =head1 NAME
@@ -207,6 +206,8 @@
 my @links;
 
 if ($parallel) {
+	eval 'use Proc::Queue size => 1;';
+	die $@ if $@;
 	$log->info("Using $parallel processes for speedup");
 	Proc::Queue::size($parallel);
 }
@@ -349,7 +350,7 @@
 		$log->info("database $database doesn't have inputs defined");
 	} );
 
-	if ( -e 'out/debug' ) {	# fixme flag?
+	if ( -e 'out/debug' ) {	# FIXME flag?
 		my $out;
 		foreach my $i ( @inputs ) {
 			warn dump( $i );
@@ -370,6 +371,11 @@
 
 		my $input_name = $input->{name} || $log->logdie("input without a name isn't valid: ",dump($input));
 
+		if ( $input->{skip} ) {
+			$log->info("skip $input_name");
+			next;
+		}
+
 		next if ($only_input && ($input_name !~ m#$only_input#i && $input->{type} !~ m#$only_input#i));
 
 		my $type = lc($input->{type});
@@ -399,7 +405,6 @@
 
 		my $input_db = new WebPAC::Input(
 			module => $input_module,
-			encoding => $config->webpac('webpac_encoding'),
 			limit => $limit || $input->{limit},
 			offset => $offset,
 			recode => $input->{recode},
@@ -444,7 +449,7 @@
 
 		my $maxmfn = $input_db->open(
 			path => $input->{path},
-			code_page => $input->{encoding},	# database encoding
+			input_encoding => $input->{encoding},	# database encoding
 			lookup_coderef => $lookup_coderef,
 			lookup => $lookup_jar,
 			%{ $input },
@@ -668,7 +673,7 @@
 		close($report_fh) if ($report_fh);
 	}
 
-	eval { $indexer->finish } if ($indexer && $indexer->can('finish'));
+	$indexer->finish if $indexer && $indexer->can('finish');
 
 	foreach my $out ( @output_modules ) {
 		$out->finish if $out->can('finish');