From 2cf5836c20b421906910cfafed272dfe8a0c6bf5 Mon Sep 17 00:00:00 2001 From: Nicholas van Oudtshoorn Date: Tue, 22 Dec 2015 11:44:13 +0800 Subject: [PATCH] Bug 15405 - XML paths to zebra libraries is wrong for 64-bit installs on non-Debian linux MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Adjusts the modulePath to search in the well-known location for 64 bit systems. Required for at least Fedora. Test plan: Without this patch, doing a zebra reindex on a fedora-based install will cause errors like this: 15:10:47-01/05 zebraidx(16108) [warn] No such record type: dom./etc/koha/zebradb/biblios/etc/dom-config.xml With this patch, reindexing should just work. Signed-off-by: Chris Cormack I have tested this doesn't break on debian/ubuntu systems, someone with a non debian system will need to test it on that Signed-off-by: Bob Ewart bob-ewart@bobsown.com It works on openSUSE Leap 42.1 Signed-off-by: Marcel de Rooy Just noting that the debian zebra files already contain much more paths here. Signed-off-by: Kyle M Hall (cherry picked from commit 3d7bb7647dd42f9c05e8b4c35ec32cd15ec4dcc4) Signed-off-by: Julian Maurice (cherry picked from commit 9c302d9c09c2c30824c3e4a1c934a5c76883cb4c) Signed-off-by: Frédéric Demians --- etc/zebradb/zebra-authorities-dom.cfg | 2 +- etc/zebradb/zebra-authorities.cfg | 2 +- etc/zebradb/zebra-biblios-dom.cfg | 2 +- etc/zebradb/zebra-biblios.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/zebradb/zebra-authorities-dom.cfg b/etc/zebradb/zebra-authorities-dom.cfg index fbde7c2a2c..f1608ec989 100644 --- a/etc/zebradb/zebra-authorities-dom.cfg +++ b/etc/zebradb/zebra-authorities-dom.cfg @@ -8,7 +8,7 @@ profilePath:__ZEBRA_CONF_DIR__/authorities/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CO encoding: UTF-8 # modulePath - where to look for loadable zebra modules -modulePath: /usr/lib/idzebra-2.0/modules +modulePath: /usr/lib/idzebra-2.0/modules:/usr/lib64/idzebra-2.0/modules:/usr/lib/x86_64-linux-gnu/idzebra-2.0/modules/ # Files that describe the attribute sets supported. attset: bib1.att diff --git a/etc/zebradb/zebra-authorities.cfg b/etc/zebradb/zebra-authorities.cfg index dea1f7b477..b133e26d19 100644 --- a/etc/zebradb/zebra-authorities.cfg +++ b/etc/zebradb/zebra-authorities.cfg @@ -8,7 +8,7 @@ profilePath:__ZEBRA_CONF_DIR__/authorities/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CO encoding: UTF-8 # modulePath - where to look for loadable zebra modules -modulePath: /usr/lib/idzebra-2.0/modules +modulePath: /usr/lib/idzebra-2.0/modules:/usr/lib64/idzebra-2.0/modules:/usr/lib/x86_64-linux-gnu/idzebra-2.0/modules/ # Files that describe the attribute sets supported. attset: bib1.att diff --git a/etc/zebradb/zebra-biblios-dom.cfg b/etc/zebradb/zebra-biblios-dom.cfg index 020437c7b8..731a73051e 100644 --- a/etc/zebradb/zebra-biblios-dom.cfg +++ b/etc/zebradb/zebra-biblios-dom.cfg @@ -5,7 +5,7 @@ # Where are the config files located? profilePath:__ZEBRA_CONF_DIR__/biblios/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CONF_DIR__/marc_defs/__ZEBRA_MARC_FORMAT__/biblios:__ZEBRA_CONF_DIR__/lang_defs/__ZEBRA_LANGUAGE__:__ZEBRA_CONF_DIR__/xsl # modulePath - where to look for loadable zebra modules -modulePath: /usr/lib/idzebra-2.0/modules +modulePath: /usr/lib/idzebra-2.0/modules:/usr/lib64/idzebra-2.0/modules:/usr/lib/x86_64-linux-gnu/idzebra-2.0/modules/ encoding: UTF-8 # Files that describe the attribute sets supported. diff --git a/etc/zebradb/zebra-biblios.cfg b/etc/zebradb/zebra-biblios.cfg index b461a64542..26739bd213 100644 --- a/etc/zebradb/zebra-biblios.cfg +++ b/etc/zebradb/zebra-biblios.cfg @@ -5,7 +5,7 @@ # Where are the config files located? profilePath:__ZEBRA_CONF_DIR__/biblios/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CONF_DIR__/marc_defs/__ZEBRA_MARC_FORMAT__/biblios:__ZEBRA_CONF_DIR__/lang_defs/__ZEBRA_LANGUAGE__ # modulePath - where to look for loadable zebra modules -modulePath: /usr/lib/idzebra-2.0/modules +modulePath: /usr/lib/idzebra-2.0/modules:/usr/lib64/idzebra-2.0/modules:/usr/lib/x86_64-linux-gnu/idzebra-2.0/modules/ encoding: UTF-8 # Files that describe the attribute sets supported. -- 2.39.5