From 09538b57de740ea27e69579f1e2b717baeeea9e1 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 20 Apr 2015 15:39:45 -0300 Subject: [PATCH] [PASSED QA] Bug 14006: about.pl checks the wrong zebra index mode When setting zebra_bib_index_mode to grs1 I get two warnings when not applying the patch: "The entry is set to grs1. GRS-1 support is now deprecated and will be removed in future releases. Please use DOM instead by setting to dom (full reindex required)." "You have set but the is not set to dom. Falling back to legacy facet calculation." When applying the patch a third warning appears in addition to the two previous ones: "The entry is set to dom, but your system still appears to be set up for grs1 indexing." Seems like the patch does what it should to me regarding the configuration mismatch warning. Signed-off-by: Eivin Giske Skaaren Signed-off-by: Katrin Fischer --- about.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/about.pl b/about.pl index 709a667..cf8ab4f 100755 --- a/about.pl +++ b/about.pl @@ -101,13 +101,17 @@ if ( ! defined C4::Context->config('zebra_bib_index_mode') ) { if C4::Context->config('zebra_bib_index_mode') eq 'grs1'; } -if ( (C4::Context->config('zebra_bib_index_mode') eq 'dom') && ($context->{'server'}->{'biblioserver'}->{'config'} !~ /zebra-biblios-dom.cfg/) ) { +if ( (C4::Context->config('zebra_bib_index_mode') eq 'dom') && + ($context->{'server'}->{'biblioserver'}->{'config'} !~ /zebra-biblios-dom.cfg/) ) { + push @xml_config_warnings, { error => 'zebra_bib_index_mode_mismatch_warn' }; } -if ( (C4::Context->config('zebra_auth_index_mode') eq 'grs1') && ($context->{'server'}->{'biblioserver'}->{'config'} =~ /zebra-biblios-dom.cfg/) ) { +if ( (C4::Context->config('zebra_bib_index_mode') eq 'grs1') && + ($context->{'server'}->{'biblioserver'}->{'config'} =~ /zebra-biblios-dom.cfg/) ) { + push @xml_config_warnings, { error => 'zebra_bib_index_mode_mismatch_warn' }; -- 1.9.1