--- trunk/run.pl	2006/07/13 21:31:32	600
+++ trunk/run.pl	2006/08/01 14:15:50	607
@@ -22,6 +22,9 @@
 use Data::Dump qw/dump/;
 use Storable qw/dclone/;
 
+use Proc::Queue size => 1;
+use POSIX ":sys_wait_h"; # imports WNOHANG
+
 =head1 NAME
 
 run.pl - start WebPAC indexing
@@ -81,6 +84,15 @@
 
 Force dump or input and marc record for debugging.
 
+=item --parallel 4
+
+Run databases in parallel (aproximatly same as number of processors in
+machine if you want to use full load)
+
+=item --only-links
+
+Create just links
+
 =back
 
 =cut
@@ -97,6 +109,8 @@
 my ($marc_normalize, $marc_output);
 my $marc_lint = 1;
 my $marc_dump = 0;
+my $parallel = 0;
+my $only_links = 0;
 
 GetOptions(
 	"limit=i" => \$limit,
@@ -112,6 +126,8 @@
 	"marc-output=s" => \$marc_output,
 	"marc-lint!" => \$marc_lint,
 	"marc-dump!" => \$marc_dump,
+	"parallel=i" => \$parallel,
+	"only-links!" => \$only_links,
 );
 
 $config = LoadFile($config);
@@ -143,13 +159,27 @@
 my $start_t = time();
 
 my @links;
-my $indexer;
+
+if ($parallel) {
+	$log->info("Using $parallel processes for speedup");
+	Proc::Queue::size($parallel);
+}
 
 while (my ($database, $db_config) = each %{ $config->{databases} }) {
 
 	my ($only_database,$only_input) = split(m#/#, $only_filter) if ($only_filter);
 	next if ($only_database && $database !~ m/$only_database/i);
 
+	if ($parallel) {
+		my $f=fork;
+		if(defined ($f) and $f==0) {
+			$log->info("Created processes $$ for speedup");
+		} else {
+			next;
+		}
+	}
+
+	my $indexer;
 	if ($use_indexer) {
 		my $indexer_config = $config->{$use_indexer} || $log->logdie("can't find '$use_indexer' part in confguration");
 		$indexer_config->{database} = $database;
@@ -178,6 +208,29 @@
 
 
 	#
+	# store Hyper Estraier links to other databases
+	#
+	if (ref($db_config->{links}) eq 'ARRAY' && $use_indexer) {
+		foreach my $link (@{ $db_config->{links} }) {
+			if ($use_indexer eq 'hyperestraier') {
+				$log->info("saving link $database -> $link->{to} [$link->{credit}]");
+				push @links, sub {
+					$log->info("adding link $database -> $link->{to} [$link->{credit}]");
+					$indexer->add_link(
+						from => $database,
+						to => $link->{to},
+						credit => $link->{credit},
+					);
+				};
+			} else {
+				$log->warn("NOT IMPLEMENTED WITH $use_indexer: adding link $database -> $link->{to} [$link->{credit}]");
+			}
+		}
+	}
+	next if ($only_links);
+
+
+	#
 	# now WebPAC::Store
 	#
 	my $abs_path = abs_path($0);
@@ -372,27 +425,24 @@
 		)
 	);
 
-	#
-	# add Hyper Estraier links to other databases
-	#
-	if (ref($db_config->{links}) eq 'ARRAY' && $use_indexer) {
-		foreach my $link (@{ $db_config->{links} }) {
-			if ($use_indexer eq 'hyperestraier') {
-				$log->info("saving link $database -> $link->{to} [$link->{credit}]");
-				push @links, {
-					from => $database,
-					to => $link->{to},
-					credit => $link->{credit},
-				};
-			} else {
-				$log->warn("NOT IMPLEMENTED WITH $use_indexer: adding link $database -> $link->{to} [$link->{credit}]");
-			}
-		}
+
+	# end forked process
+	if ($parallel) {
+		$log->info("parallel process $$ finished");
+		exit(0);
 	}
 
 }
 
+if ($parallel) {
+	# wait all children to finish
+	sleep(1) while wait != -1;
+	$log->info("all parallel processes finished");
+}
+
+
 foreach my $link (@links) {
-	$log->info("adding link $link->{from} -> $link->{to} [$link->{credit}]");
-	$indexer->add_link( %{ $link } );
+	$log->logdie("coderef in link ", Dumper($link), " is ", ref($link), " and not CODE") unless (ref($link) eq 'CODE');
+	$link->();
 }
+