Bug 14302: (follow-up) Remove traces in koha-create

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml
index b00b80a..795d3d0 100644 (file)
--- a/debian/docs/koha-create.xml
+++ b/debian/docs/koha-create.xml
@@ -27,8 +27,6 @@
       <arg choice="req"><option>--create-db</option>|<option>--request-db</option>|<option>--populate-db</option>|<option>--use-db</option></arg>
       <arg><option>--marcflavor</option> marc21|normarc|unimarc</arg>
       <arg><option>--zebralang</option> en|es|fr|gr|nb|ru|uk</arg>
-      <arg><option>--auth-idx</option> dom|grs1</arg>
-      <arg><option>--biblio-idx</option> dom|grs1</arg>
       <arg><option>--memcached-servers</option> server:port</arg>
       <arg><option>--memcached-prefix</option> namespace_prefix</arg>
       <arg><option>--defaultsql</option> /path/to/some.sql</arg>
@@ -138,20 +136,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term><option>--auth-idx</option></term>
-      <listitem>
-        <para>Specified the desired indexing mode for authority records. Valid options are <option>dom</option> (default) and <option>grs1</option>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><option>--biblio-idx</option></term>
-      <listitem>
-        <para>Specified the desired indexing mode for bibliographic records. Valid options are <option>dom</option> (default) and <option>grs1</option>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term><option>--memcached-servers</option></term>
       <listitem>
         <para>Specify a comma-separated list of host:port memcached servers for using with the created Koha instance. Defaults to <option>127.0.0.1:11211</option>, the needed configuration for a locally installed memcached server.</para>

diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index dd5908c..874c7d1 100755 (executable)
--- 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 <<EOF
-    <xi:include href="\/etc\/koha\/$marc_format-retrieval-info-bib-dom.xml"\n
-                xmlns:xi="http:\/\/www.w3.org\/2001\/XInclude">\n
-     <xi:fallback>\n
-      <retrievalinfo>
-EOF`
-
-    END_BIBLIOS_RETRIEVAL_INFO=`cat <<EOF
-      <\/retrievalinfo>\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 <<EOF
-    <xi:include href="\/etc\/koha\/$marc_format-retrieval-info-auth-dom.xml"\n
-                xmlns:xi="http:\/\/www.w3.org\/2001\/XInclude">\n
-     <xi:fallback>\n
-      <retrievalinfo>
-EOF`
-
-    END_AUTHORITIES_RETRIEVAL_INFO=`cat <<EOF
-      <\/retrievalinfo>\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="<!--"
 END_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 f0a0584..e6982bb 100644 (file)
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -18,7 +18,7 @@ __END_SRU_PUBLICSERVER__
 <listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
 <server id="mergeserver"  listenref="mergeserver">
     <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
-    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
+    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios-dom.cfg</config>
     <cql2rpn>/var/lib/koha/__KOHASITE__/pqf.properties</cql2rpn>
 </server>
 -->
@@ -26,10 +26,13 @@ __END_SRU_PUBLICSERVER__
 <!-- BIBLIOGRAPHIC RECORDS -->
 <server id="biblioserver"  listenref="biblioserver">
     <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
-    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
+    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios-dom.cfg</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
 
-    __START_BIBLIOS_RETRIEVAL_INFO__
+  <xi:include href="/etc/koha/__ZEBRA_MARC_FORMAT__-retrieval-info-bib-dom.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude">
+    <xi:fallback>
+      <retrievalinfo>
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="F"/>
@@ -76,7 +79,9 @@ __END_SRU_PUBLICSERVER__
            <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
          </backend>
        </retrieval>
-    __END_BIBLIOS_RETRIEVAL_INFO__
+      </retrievalinfo>
+    </xi:fallback>
+  </xi:include>
 
     <!-- The stuff below is used to enable SRU. It's currently disabled
          until we come up with a good way to make it get magically set up by
@@ -104,10 +109,13 @@ __END_SRU_PUBLICSERVER__
 <!-- AUTHORITY RECORDS -->
 <server id="authorityserver"  listenref="authorityserver" >
     <directory>/var/lib/koha/__KOHASITE__/authorities</directory>
-    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_AUTHORITIES_CFG__</config>
+    <config>/etc/koha/sites/__KOHASITE__/zebra-authorities-dom.cfg</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
 
-    __START_AUTHORITIES_RETRIEVAL_INFO__
+  <xi:include href="/etc/koha/__ZEBRA_MARC_FORMAT__-retrieval-info-auth-dom.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude">
+    <xi:fallback>
+      <retrievalinfo>
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="marcxml"
@@ -145,7 +153,9 @@ __END_SRU_PUBLICSERVER__
            <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
          </backend>
        </retrieval>
-    __END_AUTHORITIES_RETRIEVAL_INFO__
+      </retrievalinfo>
+    </xi:fallback>
+  </xi:include>
 
     <!-- The stuff below is used to enable SRU. It's currently disabled
          until we come up with a good way to make it get magically set up by
@@ -175,10 +185,13 @@ __END_SRU_PUBLICSERVER__
 __START_SRU_PUBLICSERVER__
 <server id="publicserver"  listenref="publicserver">
     <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
-    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
+    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios-dom.cfg</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
 
-    __START_BIBLIOS_RETRIEVAL_INFO__
+  <xi:include href="/etc/koha/__ZEBRA_MARC_FORMAT__-retrieval-info-bib-dom.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude">
+    <xi:fallback>
+      <retrievalinfo>
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="F"/>
@@ -225,7 +238,9 @@ __START_SRU_PUBLICSERVER__
            <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
          </backend>
        </retrieval>
-    __END_BIBLIOS_RETRIEVAL_INFO__
+      </retrievalinfo>
+    </xi:fallback>
+  </xi:include>
 
     <xi:include href="/etc/koha/zebradb/explain-biblios.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude">