Bug 10712: Save missing config variables to install log

The variables for AUTH_INDEX_MODE and ZEBRA_TOKENIZER were not
being saved to the koha_install_log file.  As a result when using the
--prev-install-log option in Makefile.PL the user was still prompted
to select them.

This patch adds the appropriate variables to the list saved in
the install log.

To test:

On a (non-package) system installed/upgraded without the patch running
'perl Makefile.PL --prev-install-log /path/to/koha-install-log' will
still prompt you to choose authorities indexing mode and select
between chr and icu, after upgrading with this patch applied the same
command should get the responses from the install log and not require
user intervention.

The values can be seen written into misc/koha-install-log

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/misc/koha-install-log b/misc/koha-install-log
index d842484..17dd0da 100644 (file)
--- a/misc/koha-install-log
+++ b/misc/koha-install-log
@@ -57,6 +57,8 @@ INSTALL_ZEBRA=__INSTALL_ZEBRA__
 INSTALL_SRU=__INSTALL_SRU__
 INSTALL_PAZPAR2=__INSTALL_PAZPAR2__
 BIB_INDEX_MODE=__BIB_INDEX_MODE__
+AUTH_INDEX_MODE=__AUTH_INDEX_MODE__
+ZEBRA_TOKENIZER=__ZEBRA_TOKENIZER__
 RUN_DATABASE_TESTS=__RUN_DATABASE_TESTS__
 PATH_TO_ZEBRA=__PATH_TO_ZEBRA__
 USE_MEMCACHED=__USE_MEMCACHED__

diff --git a/rewrite-config.PL b/rewrite-config.PL
index 90fd5ff..e903d49 100644 (file)
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -122,6 +122,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
   '__ZEBRA_RUN_DIR__' => "$prefix/var/run/zebradb",
   '__ZEBRA_MARC_FORMAT__' => 'marc21',
   '__ZEBRA_LANGUAGE__' => 'en',
+  '__ZEBRA_TOKENIZER__' => 'chr',
   '__ZEBRA_TOKENIZER_STMT__' => 'charmap word-phrase-utf.chr',
   '__ZEBRA_AUTH_CFG__' => 'zebra-authorities.cfg',
   '__ZEBRA_BIB_CFG__' => 'zebra-biblios.cfg',