From fc5220806746748dd115bdf3f50654c1bbab9878 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 23 Oct 2014 21:32:30 -0300 Subject: [PATCH] Bug 13140: Add a notice on the About page about GRS-1 deprecated This patch changes the text for zebra_auth_index_mode and zebra_bib_index_mode entries missing on koha-conf.xml telling the user GRS-1 is deprecated. It also adds another check for those preferences set to GRS-1, and shows a warning message if set to grs1. To test: - Apply the patch and try all combinations: - zebra_auth_index_mode and zebra_bib_index_mode missing - zebra_auth_index_mode and zebra_bib_index_mode set to grs1 - Sign off :-D Regards --- about.pl | 6 +++++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 34 ++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/about.pl b/about.pl index d144e37..02d10a9 100755 --- a/about.pl +++ b/about.pl @@ -84,12 +84,18 @@ if ( ! defined C4::Context->config('zebra_bib_index_mode') ) { push @xml_config_warnings, { error => 'zebra_bib_index_mode_warn' }; +} else { + push @xml_config_warnings, { error => 'zebra_bib_grs_warn' } + if C4::Context->config('zebra_bib_index_mode') eq 'grs1'; } if ( ! defined C4::Context->config('zebra_auth_index_mode') ) { push @xml_config_warnings, { error => 'zebra_auth_index_mode_warn' }; +} else { + push @xml_config_warnings, { error => 'zebra_auth_grs_warn' } + if C4::Context->config('zebra_auth_index_mode') eq 'grs1'; } # Test QueryParser configuration sanity diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index a5ce2f8..624304f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -145,9 +145,39 @@ XML configuration file [% FOREACH config_entry IN xml_config_warnings %] [% IF config_entry.error == 'zebra_bib_index_mode_warn' %] - Warning The <zebra_bib_index_mode> entry is missing in your configuration file. It should be set to dom or grs1. It will default to grs1 but this could change in the future. + + Warning + The <zebra_bib_index_mode> entry is missing in your configuration file. + It should be set to dom or grs1 (deprecated). + It will default to dom. + + [% ELSIF config_entry.error == 'zebra_auth_index_mode_warn' %] - Warning The <zebra_auth_index_mode> entry is missing in your configuration file. It should be set to dom or grs1. It will default to dom but this could change in the future. + + Warning + The <zebra_auth_index_mode> entry is missing in your configuration file. + It should be set to dom or grs1 (deprecated). + It will default to dom. + + + [% ELSIF config_entry.error == 'zebra_bib_grs_warn' %] + + Warning + The <zebra_bib_index_mode> entry is set to grs1. + GRS-1 support is now deprecated and will be removed in future releases. + Please use DOM instead by setting <zebra_bib_index_mode> to + dom (full reindex required). + + + [% ELSIF config_entry.error == 'zebra_auth_grs_warn' %] + + Warning + The <zebra_auth_index_mode> entry is set to grs1. + GRS-1 support is now deprecated and will be removed in future releases. + Please use DOM instead by setting <zebra_auth_index_mode> to + dom (full reindex required). + + [% ELSIF config_entry.error == 'queryparser_entry_missing' %] Warning -- 1.9.1