Bug 15405 - XML paths to zebra libraries is wrong for 64-bit installs on non-Debian...

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 <chrisc@catalyst.net.nz>
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 <m.de.rooy@rijksmuseum.nl>
Just noting that the debian zebra files already contain much more paths here.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/etc/zebradb/zebra-authorities-dom.cfg b/etc/zebradb/zebra-authorities-dom.cfg
index 64ce32d..f1608ec 100644 (file)
--- 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:/usr/lib/x86_64-linux-gnu/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 5a76e0b..b133e26 100644 (file)
--- 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:/usr/lib/x86_64-linux-gnu/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 d0755bc..731a730 100644 (file)
--- 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:/usr/lib/x86_64-linux-gnu/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 846838d..26739bd 100644 (file)
--- 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:/usr/lib/x86_64-linux-gnu/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.