View | Details | Raw Unified | Return to bug 8507
Collapse All | Expand All

(-)a/debian/docs/koha-create.xml (+16 lines)
Lines 27-32 Link Here
27
      <arg choice="req"><option>--create-db</option>|<option>--request-db</option>|<option>--populate-db</option>|<option>--use-db</option></arg>
27
      <arg choice="req"><option>--create-db</option>|<option>--request-db</option>|<option>--populate-db</option>|<option>--use-db</option></arg>
28
      <arg><option>--marcflavor</option> marc21|normarc|unimarc</arg>
28
      <arg><option>--marcflavor</option> marc21|normarc|unimarc</arg>
29
      <arg><option>--zebralang</option> en|es|fr|nb|ru|uk</arg>
29
      <arg><option>--zebralang</option> en|es|fr|nb|ru|uk</arg>
30
      <arg><option>--auth-idx</option> dom|grs1</arg>
31
      <arg><option>--biblio-idx</option> dom|grs1</arg>
30
      <arg><option>--defaultsql</option> /path/to/some.sql</arg>
32
      <arg><option>--defaultsql</option> /path/to/some.sql</arg>
31
      <arg><option>--configfile</option> /path/to/config</arg>
33
      <arg><option>--configfile</option> /path/to/config</arg>
32
      <arg><option>--passwdfile</option> /path/to/passwd</arg>
34
      <arg><option>--passwdfile</option> /path/to/passwd</arg>
Lines 109-114 Link Here
109
      </listitem>
111
      </listitem>
110
    </varlistentry>
112
    </varlistentry>
111
113
114
    <varlistentry>
115
      <term><option>--auth-idx</option></term>
116
      <listitem>
117
        <para>Specified the desired indexing mode for authority records. Valid options are <option>dom</option> (default) and <option>grs1</option>.</para>
118
      </listitem>
119
    </varlistentry>
120
121
    <varlistentry>
122
      <term><option>--biblio-idx</option></term>
123
      <listitem>
124
        <para>Specified the desired indexing mode for bibliographic records. Valid options are <option>dom</option> (default) and <option>grs1</option>.</para>
125
      </listitem>
126
    </varlistentry>
127
112
  </variablelist>
128
  </variablelist>
113
  </refsect1>
129
  </refsect1>
114
130
(-)a/debian/scripts/koha-create (-2 / +111 lines)
Lines 1-4 Link Here
1
#!/bin/sh
1
#!/bin/bash
2
#
2
#
3
# koha-create -- Create a new Koha instance.
3
# koha-create -- Create a new Koha instance.
4
# Copyright 2010  Catalyst IT, Ltd
4
# Copyright 2010  Catalyst IT, Ltd
Lines 22-27 set -e Link Here
22
usage="Usage: $0 [--create-db|--request-db|--populate-db|--use-db] \
22
usage="Usage: $0 [--create-db|--request-db|--populate-db|--use-db] \
23
    [--marcflavor marc21|normarc|unimarc] \
23
    [--marcflavor marc21|normarc|unimarc] \
24
    [--zebralang en|es|fr|nb|ru|uk] \
24
    [--zebralang en|es|fr|nb|ru|uk] \
25
    [--auth-idx dom|grs1] [--biblio-idx dom|grs1] \
25
    [--defaultsql /path/to/some.sql] \
26
    [--defaultsql /path/to/some.sql] \
26
    [--configfile /path/to/config] [--passwdfile /path/to/passwd] \
27
    [--configfile /path/to/config] [--passwdfile /path/to/passwd] \
27
    [--database database] [--adminuser n] instancename"
28
    [--database database] [--adminuser n] instancename"
Lines 45-50 generate_config_file() { Link Here
45
        -e "s/__ZEBRA_PASS__/$zebrapwd/g" \
46
        -e "s/__ZEBRA_PASS__/$zebrapwd/g" \
46
        -e "s/__ZEBRA_MARC_FORMAT__/$ZEBRA_MARC_FORMAT/g" \
47
        -e "s/__ZEBRA_MARC_FORMAT__/$ZEBRA_MARC_FORMAT/g" \
47
        -e "s/__ZEBRA_LANGUAGE__/$ZEBRA_LANGUAGE/g" \
48
        -e "s/__ZEBRA_LANGUAGE__/$ZEBRA_LANGUAGE/g" \
49
        -e "s/__BIBLIOS_INDEXING_MODE__/$BIBLIOS_INDEXING_MODE/g" \
50
        -e "s/__AUTHORITIES_INDEXING_MODE__/$AUTHORITIES_INDEXING_MODE/g" \
51
        -e "s/__ZEBRA_BIBLIOS_CFG__/$ZEBRA_BIBLIOS_CFG/g" \
52
        -e "s/__ZEBRA_AUTHORITIES_CFG__/$ZEBRA_AUTHORITIES_CFG/g" \
53
        -e "s/__START_BIBLIOS_RETRIEVAL_INFO__/`echo $START_BIBLIOS_RETRIEVAL_INFO`/g" \
54
        -e "s/__END_BIBLIOS_RETRIEVAL_INFO__/`echo $END_BIBLIOS_RETRIEVAL_INFO`/g" \
55
        -e "s/__START_AUTHORITIES_RETRIEVAL_INFO__/`echo $START_AUTHORITIES_RETRIEVAL_INFO`/g" \
56
        -e "s/__END_AUTHORITIES_RETRIEVAL_INFO__/`echo $END_AUTHORITIES_RETRIEVAL_INFO`/g" \
48
        -e "s/__DB_NAME__/$mysqldb/g" \
57
        -e "s/__DB_NAME__/$mysqldb/g" \
49
        -e "s/__DB_HOST__/$mysqlhost/g" \
58
        -e "s/__DB_HOST__/$mysqlhost/g" \
50
        -e "s/__DB_USER__/$mysqluser/g" \
59
        -e "s/__DB_USER__/$mysqluser/g" \
Lines 53-58 generate_config_file() { Link Here
53
        -e "s/__UNIXGROUP__/$username/g" \
62
        -e "s/__UNIXGROUP__/$username/g" \
54
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
63
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
55
        "/etc/koha/$1" > "$2"
64
        "/etc/koha/$1" > "$2"
65
56
}
66
}
57
67
58
getmysqlhost() {
68
getmysqlhost() {
Lines 75-80 getinstancemysqldatabase() { Link Here
75
    xmlstarlet sel -t -v 'yazgfs/config/database' "/etc/koha/sites/$1/koha-conf.xml"
85
    xmlstarlet sel -t -v 'yazgfs/config/database' "/etc/koha/sites/$1/koha-conf.xml"
76
}
86
}
77
87
88
set_biblios_indexing_mode()
89
{
90
    local indexing_mode=$1
91
    local marc_format=$2
92
93
    case $indexing_mode in
94
        "dom")
95
            START_BIBLIOS_RETRIEVAL_INFO=`cat <<EOF
96
    <xi:include href="\/etc\/koha\/$marc_format-retrieval-info-bib-dom.xml"\n
97
                xmlns:xi="http:\/\/www.w3.org\/2001\/XInclude">\n
98
     <xi:fallback>\n
99
      <retrievalinfo>
100
EOF`
101
102
            END_BIBLIOS_RETRIEVAL_INFO=`cat <<EOF
103
      <\/retrievalinfo>\n
104
     <\/xi:fallback>\n
105
    <\/xi:include>
106
EOF`
107
            BIBLIOS_INDEXING_MODE="dom"
108
            ZEBRA_BIBLIOS_CFG="zebra-biblios-dom.cfg"
109
            ;;
110
        "grs1")
111
            START_BIBLIOS_RETRIEVAL_INFO="    <retrievalinfo>"
112
            END_BIBLIOS_RETRIEVAL_INFO="    <\/retrievalinfo>"
113
            BIBLIOS_INDEXING_MODE="grs1"
114
            ZEBRA_BIBLIOS_CFG="zebra-biblios.cfg"
115
            ;;
116
        *)
117
            die "Error: '$indexing_mode' is not a valid indexing mode for bibliographic records."
118
            ;;
119
    esac
120
}
121
122
123
set_authorities_indexing_mode()
124
{
125
    local indexing_mode=$1
126
    local marc_format=$2
127
128
    case $indexing_mode in
129
        "dom")
130
            START_AUTHORITIES_RETRIEVAL_INFO=`cat <<EOF
131
    <xi:include href="\/etc\/koha\/$marc_format-retrieval-info-auth-dom.xml"\n
132
                xmlns:xi="http:\/\/www.w3.org\/2001\/XInclude">\n
133
     <xi:fallback>\n
134
      <retrievalinfo>
135
EOF`
136
137
            END_AUTHORITIES_RETRIEVAL_INFO=`cat <<EOF
138
      <\/retrievalinfo>\n
139
     <\/xi:fallback>\n
140
    <\/xi:include>\n
141
EOF`
142
            AUTHORITIES_INDEXING_MODE="dom"
143
            ZEBRA_AUTHORITIES_CFG="zebra-authorities-dom.cfg"
144
            ;;
145
        "grs1")
146
            START_AUTHORITIES_RETRIEVAL_INFO="    <retrievalinfo>"
147
            END_AUTHORITIES_RETRIEVAL_INFO="    <\/retrievalinfo>"
148
            AUTHORITIES_INDEXING_MODE="grs1"
149
            ZEBRA_AUTHORITIES_CFG="zebra-authorities.cfg"
150
            ;;
151
        *)
152
            die "Error: '$indexing_mode' is not a valid indexing mode for authority records."
153
            ;;
154
    esac
155
}
156
78
# Set defaults and read config file, if it exists.
157
# Set defaults and read config file, if it exists.
79
DOMAIN=""
158
DOMAIN=""
80
OPACPORT="80"
159
OPACPORT="80"
Lines 88-93 ZEBRA_MARC_FORMAT="marc21" Link Here
88
ZEBRA_LANGUAGE="en"
167
ZEBRA_LANGUAGE="en"
89
ADMINUSER="1"
168
ADMINUSER="1"
90
PASSWDFILE="/etc/koha/passwd"
169
PASSWDFILE="/etc/koha/passwd"
170
171
# Indexing mode variables (default is DOM)
172
BIBLIOS_INDEXING_MODE="dom"
173
AUTHORITIES_INDEXING_MODE="dom"
174
175
START_BIBLIOS_RETRIEVAL_INFO=""
176
END_BIBLIOS_RETRIEVAL_INFO=""
177
START_AUTHORITIES_RETRIEVAL_INFO=""
178
END_AUTHORITIES_RETRIEVAL_INFO=""
179
91
if [ -e /etc/koha/koha-sites.conf ]
180
if [ -e /etc/koha/koha-sites.conf ]
92
then
181
then
93
    . /etc/koha/koha-sites.conf
182
    . /etc/koha/koha-sites.conf
Lines 95-101 fi Link Here
95
184
96
[ $# -ge 2 ] && [ $# -le 16 ] || die $usage
185
[ $# -ge 2 ] && [ $# -le 16 ] || die $usage
97
186
98
TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,marcflavor:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser: \
187
TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser: \
99
     -n "$0" -- "$@"`
188
     -n "$0" -- "$@"`
100
189
101
# Note the quotes around `$TEMP': they are essential!
190
# Note the quotes around `$TEMP': they are essential!
Lines 106-111 CLO_ZEBRA_MARC_FORMAT="" Link Here
106
CLO_ZEBRA_LANGUAGE=""
195
CLO_ZEBRA_LANGUAGE=""
107
CLO_DEFAULTSQL=""
196
CLO_DEFAULTSQL=""
108
CLO_ADMINUSER=""
197
CLO_ADMINUSER=""
198
CLO_BIBLIOS_INDEXING_MODE=""
199
CLO_AUTHORITIES_INDEXING_MODE=""
200
109
201
110
while true ; do
202
while true ; do
111
	case "$1" in
203
	case "$1" in
Lines 115-120 while true ; do Link Here
115
        -u|--use-db) op=use ; shift ;;
207
        -u|--use-db) op=use ; shift ;;
116
		-m|--marcflavor) CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
208
		-m|--marcflavor) CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
117
		-l|--zebralang) CLO_ZEBRA_LANGUAGE="$2" ; shift 2 ;;
209
		-l|--zebralang) CLO_ZEBRA_LANGUAGE="$2" ; shift 2 ;;
210
		--auth-idx) CLO_AUTHORITIES_INDEXING_MODE="$2" ; shift 2 ;;
211
		--biblio-idx) CLO_BIBLIOS_INDEXING_MODE="$2" ; shift 2 ;;
118
		-d|--defaultsql) CLO_DEFAULTSQL="$2" ; shift 2 ;;
212
		-d|--defaultsql) CLO_DEFAULTSQL="$2" ; shift 2 ;;
119
		-f|--configfile) configfile="$2" ; shift 2 ;;
213
		-f|--configfile) configfile="$2" ; shift 2 ;;
120
        -s|--passwdfile) CLO_PASSWDFILE="$2" ; shift 2 ;;
214
        -s|--passwdfile) CLO_PASSWDFILE="$2" ; shift 2 ;;
Lines 158-163 then Link Here
158
    PASSWDFILE="$CLO_PASSWDFILE"
252
    PASSWDFILE="$CLO_PASSWDFILE"
159
fi
253
fi
160
254
255
if [ "$CLO_BIBLIOS_INDEXING_MODE" !=  "" ]; then
256
    BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE
257
fi
258
259
set_biblios_indexing_mode $BIBLIOS_INDEXING_MODE $ZEBRA_MARC_FORMAT
260
261
262
if [ "$CLO_AUTHORITIES_INDEXING_MODE" !=  "" ]; then
263
    AUTHORITIES_INDEXING_MODE=$CLO_AUTHORITIES_INDEXING_MODE
264
fi
265
266
set_authorities_indexing_mode $AUTHORITIES_INDEXING_MODE $ZEBRA_MARC_FORMAT
267
161
name="$1"
268
name="$1"
162
269
163
opacdomain="$OPACPREFIX$name$OPACSUFFIX$DOMAIN"
270
opacdomain="$OPACPREFIX$name$OPACSUFFIX$DOMAIN"
Lines 261-266 eof Link Here
261
    # Generate and install Zebra config files.
368
    # Generate and install Zebra config files.
262
    generate_config_file zebra-biblios-site.cfg.in \
369
    generate_config_file zebra-biblios-site.cfg.in \
263
        "/etc/koha/sites/$name/zebra-biblios.cfg"
370
        "/etc/koha/sites/$name/zebra-biblios.cfg"
371
    generate_config_file zebra-biblios-dom-site.cfg.in \
372
        "/etc/koha/sites/$name/zebra-biblios-dom.cfg"
264
    generate_config_file zebra-authorities-site.cfg.in \
373
    generate_config_file zebra-authorities-site.cfg.in \
265
        "/etc/koha/sites/$name/zebra-authorities.cfg"
374
        "/etc/koha/sites/$name/zebra-authorities.cfg"
266
    generate_config_file zebra-authorities-dom-site.cfg.in \
375
    generate_config_file zebra-authorities-dom-site.cfg.in \
(-)a/debian/scripts/koha-remove (+2 lines)
Lines 74-79 eof Link Here
74
        rm "/etc/koha/sites/$name/koha-conf.xml"
74
        rm "/etc/koha/sites/$name/koha-conf.xml"
75
    [ -f "/etc/koha/sites/$name/zebra-biblios.cfg" ] && \
75
    [ -f "/etc/koha/sites/$name/zebra-biblios.cfg" ] && \
76
        rm "/etc/koha/sites/$name/zebra-biblios.cfg"
76
        rm "/etc/koha/sites/$name/zebra-biblios.cfg"
77
    [ -f "/etc/koha/sites/$name/zebra-biblios-dom.cfg" ] && \
78
        rm "/etc/koha/sites/$name/zebra-biblios-dom.cfg"
77
    [ -f "/etc/koha/sites/$name/zebra-authorities.cfg" ] && \
79
    [ -f "/etc/koha/sites/$name/zebra-authorities.cfg" ] && \
78
        rm "/etc/koha/sites/$name/zebra-authorities.cfg"
80
        rm "/etc/koha/sites/$name/zebra-authorities.cfg"
79
    [ -f "/etc/koha/sites/$name/zebra-authorities-dom.cfg" ] && \
81
    [ -f "/etc/koha/sites/$name/zebra-authorities-dom.cfg" ] && \
(-)a/debian/templates/koha-conf-site.xml.in (-15 / +18 lines)
Lines 18-24 Link Here
18
<listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
18
<listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
19
<server id="mergeserver"  listenref="mergeserver">
19
<server id="mergeserver"  listenref="mergeserver">
20
    <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
20
    <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
21
    <config>/var/lib/koha/__KOHASITE__/zebra-biblios.cfg</config>
21
    <config>/var/lib/koha/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
22
    <cql2rpn>/var/lib/koha/__KOHASITE__/pqf.properties</cql2rpn>
22
    <cql2rpn>/var/lib/koha/__KOHASITE__/pqf.properties</cql2rpn>
23
</server>
23
</server>
24
-->
24
-->
Lines 26-34 Link Here
26
<!-- BIBLIOGRAPHIC RECORDS -->
26
<!-- BIBLIOGRAPHIC RECORDS -->
27
<server id="biblioserver"  listenref="biblioserver">
27
<server id="biblioserver"  listenref="biblioserver">
28
    <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
28
    <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
29
    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios.cfg</config>
29
    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
30
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
30
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
31
     <retrievalinfo>
31
32
    __START_BIBLIOS_RETRIEVAL_INFO__
32
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
33
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
33
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
34
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
34
       <retrieval syntax="xml" name="F"/>
35
       <retrieval syntax="xml" name="F"/>
Lines 75-81 Link Here
75
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
76
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
76
         </backend>
77
         </backend>
77
       </retrieval>
78
       </retrieval>
78
     </retrievalinfo>
79
    __END_BIBLIOS_RETRIEVAL_INFO__
80
79
    <!-- The stuff below is used to enable SRU. It's currently disabled
81
    <!-- The stuff below is used to enable SRU. It's currently disabled
80
         until we come up with a good way to make it get magically set up by
82
         until we come up with a good way to make it get magically set up by
81
         the packaging system. If you need it, uncomment and set it up
83
         the packaging system. If you need it, uncomment and set it up
Lines 102-113 Link Here
102
<!-- AUTHORITY RECORDS -->
104
<!-- AUTHORITY RECORDS -->
103
<server id="authorityserver"  listenref="authorityserver" >
105
<server id="authorityserver"  listenref="authorityserver" >
104
    <directory>/var/lib/koha/__KOHASITE__/authorities</directory>
106
    <directory>/var/lib/koha/__KOHASITE__/authorities</directory>
105
    <config>/etc/koha/sites/__KOHASITE__/zebra-authorities-dom.cfg</config>
107
    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_AUTHORITIES_CFG__</config>
106
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
108
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
107
    <xi:include href="/etc/koha/__ZEBRA_MARC_FORMAT__-retrieval-info-auth-dom.xml"
109
108
                xmlns:xi="http://www.w3.org/2001/XInclude">
110
    __START_AUTHORITIES_RETRIEVAL_INFO__
109
      <xi:fallback>
110
     <retrievalinfo>
111
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
111
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
112
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
112
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
113
       <retrieval syntax="xml" name="marcxml"
113
       <retrieval syntax="xml" name="marcxml"
Lines 145-153 Link Here
145
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
145
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
146
         </backend>
146
         </backend>
147
       </retrieval>
147
       </retrieval>
148
     </retrievalinfo>
148
    __END_AUTHORITIES_RETRIEVAL_INFO__
149
      </xi:fallback>
149
150
    </xi:include>
151
    <!-- The stuff below is used to enable SRU. It's currently disabled
150
    <!-- The stuff below is used to enable SRU. It's currently disabled
152
         until we come up with a good way to make it get magically set up by
151
         until we come up with a good way to make it get magically set up by
153
         the packaging system. If you need it, uncomment and set it up
152
         the packaging system. If you need it, uncomment and set it up
Lines 176-184 Link Here
176
175
177
<server id="publicserver"  listenref="publicserver">
176
<server id="publicserver"  listenref="publicserver">
178
    <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
177
    <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
179
    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios.cfg</config>
178
    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
180
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
179
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
181
     <retrievalinfo>
180
181
    __START_BIBLIOS_RETRIEVAL_INFO__
182
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
182
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
183
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
183
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
184
       <retrieval syntax="xml" name="F"/>
184
       <retrieval syntax="xml" name="F"/>
Lines 225-231 Link Here
225
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
225
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
226
         </backend>
226
         </backend>
227
       </retrieval>
227
       </retrieval>
228
     </retrievalinfo>
228
    __END_BIBLIOS_RETRIEVAL_INFO__
229
229
    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
230
    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
230
                xmlns:xi="http://www.w3.org/2001/XInclude">
231
                xmlns:xi="http://www.w3.org/2001/XInclude">
231
      <xi:fallback>
232
      <xi:fallback>
Lines 277-282 Link Here
277
 <useldapserver>0</useldapserver><!-- see C4::Auth_with_ldap for extra configs you must add if you want to turn this on -->
278
 <useldapserver>0</useldapserver><!-- see C4::Auth_with_ldap for extra configs you must add if you want to turn this on -->
278
 <memcached_servers></memcached_servers>
279
 <memcached_servers></memcached_servers>
279
 <memcached_namespace></memcached_namespace>
280
 <memcached_namespace></memcached_namespace>
281
 <zebra_bib_index_mode>__BIBLIOS_INDEXING_MODE__</zebra_bib_index_mode>
282
 <zebra_auth_index_mode>__AUTHORITIES_INDEXING_MODE__</zebra_auth_index_mode>
280
 <queryparser_config>/etc/koha/searchengine/queryparser.yaml</queryparser_config>
283
 <queryparser_config>/etc/koha/searchengine/queryparser.yaml</queryparser_config>
281
</config>
284
</config>
282
285
(-)a/debian/templates/zebra-biblios-dom-site.cfg.in (-12 / +11 lines)
Lines 3-9 Link Here
3
# $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
3
# $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
4
#
4
#
5
# Where are the config files located?
5
# Where are the config files located?
6
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
6
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__:/etc/koha/zebradb/xsl
7
# modulePath - where to look for loadable zebra modules
7
# modulePath - where to look for loadable zebra modules
8
modulePath: /usr/lib/idzebra-2.0/modules
8
modulePath: /usr/lib/idzebra-2.0/modules
9
9
Lines 21-29 attset: gils.att Link Here
21
# http://www.indexdata.dk/zebra/doc/zebra-cfg.tkl
21
# http://www.indexdata.dk/zebra/doc/zebra-cfg.tkl
22
# http://www.indexdata.dk/zebra/doc/grs.tkl
22
# http://www.indexdata.dk/zebra/doc/grs.tkl
23
23
24
recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config.xml
24
recordtype: dom./etc/koha/zebradb/biblios/etc/dom-config.xml
25
marcxml.recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config.xml
25
marcxml.recordtype: dom./etc/koha/zebradb/biblios/etc/dom-config.xml
26
iso2709.recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config-marc.xml
26
iso2709.recordtype: dom./etc/koha/zebradb/biblios/etc/dom-config-marc.xml
27
27
28
recordId: (bib1,Local-number)
28
recordId: (bib1,Local-number)
29
storeKeys:1
29
storeKeys:1
Lines 31-48 storeData:1 Link Here
31
31
32
32
33
# Lock File Area
33
# Lock File Area
34
lockDir: __ZEBRA_LOCK_DIR__/biblios
34
lockDir: /var/lock/koha/__KOHASITE__/biblios
35
perm.anonymous:ar
35
perm.anonymous:ar
36
perm.__ZEBRA_USER__:rw
36
perm.kohauser:rw
37
passwd: __ZEBRA_CONF_DIR__/etc/passwd
37
passwd: /etc/koha/sites/__KOHASITE__/zebra.passwd
38
register: __ZEBRA_DATA_DIR__/biblios/register:20G
38
register: /var/lib/koha/__KOHASITE__/biblios/register:20G
39
shadow: __ZEBRA_DATA_DIR__/biblios/shadow:20G
39
shadow: /var/lib/koha/__KOHASITE__/biblios/shadow:20G
40
40
41
# Temp File area for result sets
41
# Temp File area for result sets
42
setTmpDir: __ZEBRA_DATA_DIR__/biblios/tmp
42
setTmpDir: /var/lib/koha/__KOHASITE__/biblios/tmp
43
43
44
# Temp File area for index program
44
# Temp File area for index program
45
keyTmpDir: __ZEBRA_DATA_DIR__/biblios/key
45
keyTmpDir: /var/lib/koha/__KOHASITE__/biblios/key
46
46
47
# Approx. Memory usage during indexing
47
# Approx. Memory usage during indexing
48
memMax: 50M
48
memMax: 50M
49
- 

Return to bug 8507