[Koha-patches] [PATCH 1/5] Bug 6540 - Make ZEBRA_MARC_FORMAT and ZEBRA_LANGUAGE configurable for koha-create

[Robin Sheat]

From: Magnus Enger <magnus at enger.priv.no>

Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
---
 debian/scripts/koha-create                         |    4 ++++
 debian/templates/zebra-authorities-dom-site.cfg.in |    2 +-
 debian/templates/zebra-authorities-site.cfg.in     |    2 +-
 debian/templates/zebra-biblios-site.cfg.in         |    2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index e3c73fc..c3bd465 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -36,6 +36,8 @@ generate_config_file() {
         -e "s/__OPACSERVER__/$domain/g" \
         -e "s/__INTRASERVER__/$intradomain/g" \
         -e "s/__ZEBRA_PASS__/$zebrapwd/g" \
+        -e "s/__ZEBRA_MARC_FORMAT__/$ZEBRA_MARC_FORMAT/g" \
+        -e "s/__ZEBRA_LANGUAGE__/$ZEBRA_LANGUAGE/g" \
         -e "s/__DB_NAME__/$mysqldb/g" \
         -e "s/__DB_HOST__/$mysqlhost/g" \
         -e "s/__DB_USER__/$mysqluser/g" \
@@ -65,6 +67,8 @@ INTRAPORT="8080"
 INTRAPREFIX=""
 INTRASUFFIX=""
 DEFAULTSQL=""
+ZEBRA_MARC_FORMAT="marc21"
+ZEBRA_LANGUAGE="en"
 if [ -e /etc/koha/koha-sites.conf ]
 then
     . /etc/koha/koha-sites.conf
diff --git a/debian/templates/zebra-authorities-dom-site.cfg.in b/debian/templates/zebra-authorities-dom-site.cfg.in
index 5b8fd7a..524e4fb 100644
--- a/debian/templates/zebra-authorities-dom-site.cfg.in
+++ b/debian/templates/zebra-authorities-dom-site.cfg.in
@@ -4,7 +4,7 @@
 # $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
 #
 # Where are the config files located?
-profilePath:/etc/koha/zebradb/authorities/etc:/etc/koha/zebradb/etc:/etc/koha/zebradb/marc_defs/marc21/authorities:/etc/koha/zebradb/lang_defs/en:/etc/koha/zebradb/xsl
+profilePath:/etc/koha/zebradb/authorities/etc:/etc/koha/zebradb/etc:/etc/koha/zebradb/marc_defs/__ZEBRA_MARC_FORMAT__/authorities:/etc/koha/zebradb/lang_defs/__ZEBRA_LANGUAGE__:/etc/koha/zebradb/xsl
 
 encoding: UTF-8
 # modulePath - where to look for loadable zebra modules
diff --git a/debian/templates/zebra-authorities-site.cfg.in b/debian/templates/zebra-authorities-site.cfg.in
index 01cd347..dc67a19 100644
--- a/debian/templates/zebra-authorities-site.cfg.in
+++ b/debian/templates/zebra-authorities-site.cfg.in
@@ -4,7 +4,7 @@
 # $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
 #
 # Where are the config files located?
-profilePath:/etc/koha/zebradb/authorities/etc:/etc/koha/zebradb/etc:/etc/koha/zebradb/marc_defs/marc21/authorities:/etc/koha/zebradb/lang_defs/en
+profilePath:/etc/koha/zebradb/authorities/etc:/etc/koha/zebradb/etc:/etc/koha/zebradb/marc_defs/__ZEBRA_MARC_FORMAT__/authorities:/etc/koha/zebradb/lang_defs/__ZEBRA_LANGUAGE__
 
 encoding: UTF-8
 # modulePath - where to look for loadable zebra modules
diff --git a/debian/templates/zebra-biblios-site.cfg.in b/debian/templates/zebra-biblios-site.cfg.in
index fea467f..f1cfb07 100644
--- a/debian/templates/zebra-biblios-site.cfg.in
+++ b/debian/templates/zebra-biblios-site.cfg.in
@@ -3,7 +3,7 @@
 # $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
 #
 # Where are the config files located?
-profilePath:/etc/koha/zebradb/biblios/etc:/etc/koha/zebradb/etc:/etc/koha/zebradb/marc_defs/marc21/biblios:/etc/koha/zebradb/lang_defs/en
+profilePath:/etc/koha/zebradb/biblios/etc:/etc/koha/zebradb/etc:/etc/koha/zebradb/marc_defs/__ZEBRA_MARC_FORMAT__/biblios:/etc/koha/zebradb/lang_defs/__ZEBRA_LANGUAGE__
 # modulePath - where to look for loadable zebra modules
 modulePath: /usr/lib/idzebra-2.0/modules
 
-- 
1.7.4.1