From b25de3e7cf53265f0ded8e3ab4cce82457b8f14d Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Sun, 24 Nov 2013 18:20:56 +0000 Subject: [PATCH] Bug 6435: (follow-up) make -daemon really imply -a and -b This patch follows up on the previous patch by moving the check for whether authority and/or biblio indexing have been specified so that -daemon has a chance to set those modes. Signed-off-by: Galen Charlton --- misc/migration_tools/rebuild_zebra.pl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl index 8b9af5cf35..7e0c83afaa 100755 --- a/misc/migration_tools/rebuild_zebra.pl +++ b/misc/migration_tools/rebuild_zebra.pl @@ -83,12 +83,6 @@ if( not defined $run_as_root and $run_user eq 'root') { die $msg; } -if (not $biblios and not $authorities) { - my $msg = "Must specify -b or -a to reindex bibs or authorities\n"; - $msg .= "Please do '$0 --help' to see usage.\n"; - die $msg; -} - if ( !$as_xml and $nosanitize ) { my $msg = "Cannot specify both -no_xml and -nosanitize\n"; $msg .= "Please do '$0 --help' to see usage.\n"; @@ -128,6 +122,13 @@ if ($daemon_mode) { $process_zebraqueue = 1; } +if (not $biblios and not $authorities) { + my $msg = "Must specify -b or -a to reindex bibs or authorities\n"; + $msg .= "Please do '$0 --help' to see usage.\n"; + die $msg; +} + + # -v is for verbose, which seems backwards here because of how logging is set # on the CLI of zebraidx. It works this way. The default is to not log much if ($verbose_logging >= 2) { -- 2.39.5