--- trunk/run.pl	2006/08/01 14:15:50	607
+++ trunk/run.pl	2006/08/01 16:47:40	608
@@ -93,6 +93,10 @@
 
 Create just links
 
+=item --merge
+
+Create merged index of databases which have links
+
 =back
 
 =cut
@@ -111,6 +115,7 @@
 my $marc_dump = 0;
 my $parallel = 0;
 my $only_links = 0;
+my $merge = 0;
 
 GetOptions(
 	"limit=i" => \$limit,
@@ -128,6 +133,7 @@
 	"marc-dump!" => \$marc_dump,
 	"parallel=i" => \$parallel,
 	"only-links!" => \$only_links,
+	"merge" => \$merge,
 );
 
 $config = LoadFile($config);
@@ -139,11 +145,23 @@
 my $log = _new WebPAC::Common()->_get_logger();
 $log->info( "-" x 79 );
 
+
+my $estcmd_fh;
+my $estcmd_path = './estcmd-merge.sh';
+if ($merge) {
+	open($estcmd_fh, '>', $estcmd_path) || $log->logdie("can't open $estcmd_path: $!");
+	print $estcmd_fh 'cd /data/estraier/_node/ || exit 1',$/;
+	print $estcmd_fh 'sudo /etc/init.d/hyperestraier stop',$/;
+	$log->info("created merge batch file $estcmd_path");
+}
+
+
 my $validate;
 $validate = new WebPAC::Validate(
 	path => $validate_path,
 ) if ($validate_path);
 
+
 my $use_indexer = $config->{use_indexer} || 'hyperestraier';
 if ($stats) {
 	$log->debug("option --stats disables update of indexing engine...");
@@ -186,6 +204,9 @@
 		$indexer_config->{clean} = $clean;
 		$indexer_config->{label} = $db_config->{name};
 
+		# force clean if database has links
+		$indexer_config->{clean} = 1 if ($db_config->{links});
+
 		if ($use_indexer eq 'hyperestraier') {
 
 			# open Hyper Estraier database
@@ -213,15 +234,19 @@
 	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},
-					);
-				};
+				if ($merge) {
+					print $estcmd_fh 'sudo -u www-data estcmd merge ' . $database . ' ' . $link->{to},$/;
+				} else {
+					$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}]");
 			}
@@ -440,9 +465,18 @@
 	$log->info("all parallel processes finished");
 }
 
-
-foreach my $link (@links) {
-	$log->logdie("coderef in link ", Dumper($link), " is ", ref($link), " and not CODE") unless (ref($link) eq 'CODE');
-	$link->();
+#
+# handle links or merge after indexing
+#
+
+if ($merge) {
+	print $estcmd_fh 'sudo /etc/init.d/hyperestraier start',$/;
+	close($estcmd_fh);
+	chmod 0700, $estcmd_path || $log->warn("can't chmod 0700 $estcmd_path: $!");
+	system $estcmd_path;
+} else {
+	foreach my $link (@links) {
+		$log->logdie("coderef in link ", Dumper($link), " is ", ref($link), " and not CODE") unless (ref($link) eq 'CODE');
+		$link->();
+	}
 }
-