From 8f4c686e7cb4d7a9825963e480b44b9323967343 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 24 Aug 2018 15:15:30 -0300 Subject: [PATCH] Bug 14302: (follow-up) Remove traces in koha-create Signed-off-by: Tomas Cohen Arazi Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- debian/docs/koha-create.xml | 16 ------- debian/scripts/koha-create | 63 -------------------------- debian/templates/koha-conf-site.xml.in | 35 ++++++++++---- 3 files changed, 25 insertions(+), 89 deletions(-) diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml index b00b80a3e5..795d3d00e4 100644 --- a/debian/docs/koha-create.xml +++ b/debian/docs/koha-create.xml @@ -27,8 +27,6 @@ ||| marc21|normarc|unimarc en|es|fr|gr|nb|ru|uk - dom|grs1 - dom|grs1 server:port namespace_prefix /path/to/some.sql @@ -137,20 +135,6 @@ - - - - Specified the desired indexing mode for authority records. Valid options are (default) and . - - - - - - - Specified the desired indexing mode for bibliographic records. Valid options are (default) and . - - - diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index dd5908cdd4..874c7d1c79 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -53,10 +53,6 @@ Options: normarc and unimarc. --zebralang lang Choose the primary language for Zebra indexing. Valid values are cs, en (default), es, fr, gr, nb, ru and uk. - --auth-idx idx_mode Set the indexing mode for authority records. Valid - values are dom (default) and grs1. - --biblio-idx idx_mode Set the indexing mode for bibliographic records. - Valid values are dom (default) and grs1. --memcached-servers str Set a comma-separated list of host:port memcached servers. --memcached-prefix str Set the desired prefix for the instance memcached namespace. --enable-sru Enable the Z39.50/SRU server (default: disabled). @@ -102,12 +98,6 @@ generate_config_file() { -e "s/__SRU_BIBLIOS_PORT__/$SRU_SERVER_PORT/g" \ -e "s/__START_SRU_PUBLICSERVER__/$START_SRU_PUBLICSERVER/g" \ -e "s/__END_SRU_PUBLICSERVER__/$END_SRU_PUBLICSERVER/g" \ - -e "s/__ZEBRA_BIBLIOS_CFG__/$ZEBRA_BIBLIOS_CFG/g" \ - -e "s/__ZEBRA_AUTHORITIES_CFG__/$ZEBRA_AUTHORITIES_CFG/g" \ - -e "s/__START_BIBLIOS_RETRIEVAL_INFO__/`echo $START_BIBLIOS_RETRIEVAL_INFO`/g" \ - -e "s/__END_BIBLIOS_RETRIEVAL_INFO__/`echo $END_BIBLIOS_RETRIEVAL_INFO`/g" \ - -e "s/__START_AUTHORITIES_RETRIEVAL_INFO__/`echo $START_AUTHORITIES_RETRIEVAL_INFO`/g" \ - -e "s/__END_AUTHORITIES_RETRIEVAL_INFO__/`echo $END_AUTHORITIES_RETRIEVAL_INFO`/g" \ -e "s/__API_SECRET__/$API_SECRET/g" \ -e "s/__DB_NAME__/$mysqldb/g" \ -e "s/__DB_HOST__/$mysqlhost/g" \ @@ -224,46 +214,6 @@ EOM } -set_biblios_indexing_mode() -{ - local marc_format=$1 - - START_BIBLIOS_RETRIEVAL_INFO=`cat <\n - \n - -EOF` - - END_BIBLIOS_RETRIEVAL_INFO=`cat <\n - <\/xi:fallback>\n - <\/xi:include> -EOF` - ZEBRA_BIBLIOS_CFG="zebra-biblios-dom.cfg" -} - - -set_authorities_indexing_mode() -{ - local marc_format=$1 - - START_AUTHORITIES_RETRIEVAL_INFO=`cat <\n - \n - -EOF` - - END_AUTHORITIES_RETRIEVAL_INFO=`cat <\n - <\/xi:fallback>\n - <\/xi:include>\n -EOF` - ZEBRA_AUTHORITIES_CFG="zebra-authorities-dom.cfg" -} - - set_memcached() { local instance="$1" @@ -414,11 +364,6 @@ DEFAULT_SRU_SERVER_PORT="7090" START_SRU_PUBLICSERVER="" -START_BIBLIOS_RETRIEVAL_INFO="" -END_BIBLIOS_RETRIEVAL_INFO="" -START_AUTHORITIES_RETRIEVAL_INFO="" -END_AUTHORITIES_RETRIEVAL_INFO="" - APACHE_CONFIGFILE="" if [ -e /etc/koha/koha-sites.conf ] @@ -537,18 +482,10 @@ if [ "$CLO_TIMEZONE" != "" ]; then TIMEZONE=$CLO_TIMEZONE fi -if [ "$CLO_BIBLIOS_INDEXING_MODE" != "" ]; then - BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE -fi - -set_biblios_indexing_mode $ZEBRA_MARC_FORMAT - if [ "$ENABLE_SRU" != "no" ]; then enable_sru_server fi -set_authorities_indexing_mode $ZEBRA_MARC_FORMAT - [ $# -ge 1 ] || ( usage ; die "Missing instance name..." ) name="$1" diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in index f0a0584103..e6982bb27c 100644 --- a/debian/templates/koha-conf-site.xml.in +++ b/debian/templates/koha-conf-site.xml.in @@ -18,7 +18,7 @@ __END_SRU_PUBLICSERVER__ tcp:@:__MERGE_SERVER_PORT__ /var/lib/koha/__KOHASITE__/biblios - /etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__ + /etc/koha/sites/__KOHASITE__/zebra-biblios-dom.cfg /var/lib/koha/__KOHASITE__/pqf.properties --> @@ -26,10 +26,13 @@ __END_SRU_PUBLICSERVER__ /var/lib/koha/__KOHASITE__/biblios - /etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__ + /etc/koha/sites/__KOHASITE__/zebra-biblios-dom.cfg /etc/koha/zebradb/pqf.properties - __START_BIBLIOS_RETRIEVAL_INFO__ + + + @@ -76,7 +79,9 @@ __END_SRU_PUBLICSERVER__ - __END_BIBLIOS_RETRIEVAL_INFO__ + + + /var/lib/koha/__KOHASITE__/authorities - /etc/koha/sites/__KOHASITE__/__ZEBRA_AUTHORITIES_CFG__ + /etc/koha/sites/__KOHASITE__/zebra-authorities-dom.cfg /etc/koha/zebradb/pqf.properties - __START_AUTHORITIES_RETRIEVAL_INFO__ + + + - __END_AUTHORITIES_RETRIEVAL_INFO__ + + +