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

(-)a/debian/docs/koha-create.xml (-16 lines)
Lines 27-34 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|gr|nb|ru|uk</arg>
29
      <arg><option>--zebralang</option> en|es|fr|gr|nb|ru|uk</arg>
30
      <arg><option>--auth-idx</option> dom|grs1</arg>
31
      <arg><option>--biblio-idx</option> dom|grs1</arg>
32
      <arg><option>--memcached-servers</option> server:port</arg>
30
      <arg><option>--memcached-servers</option> server:port</arg>
33
      <arg><option>--memcached-prefix</option> namespace_prefix</arg>
31
      <arg><option>--memcached-prefix</option> namespace_prefix</arg>
34
      <arg><option>--defaultsql</option> /path/to/some.sql</arg>
32
      <arg><option>--defaultsql</option> /path/to/some.sql</arg>
Lines 137-156 Link Here
137
      </listitem>
135
      </listitem>
138
    </varlistentry>
136
    </varlistentry>
139
137
140
    <varlistentry>
141
      <term><option>--auth-idx</option></term>
142
      <listitem>
143
        <para>Specified the desired indexing mode for authority records. Valid options are <option>dom</option> (default) and <option>grs1</option>.</para>
144
      </listitem>
145
    </varlistentry>
146
147
    <varlistentry>
148
      <term><option>--biblio-idx</option></term>
149
      <listitem>
150
        <para>Specified the desired indexing mode for bibliographic records. Valid options are <option>dom</option> (default) and <option>grs1</option>.</para>
151
      </listitem>
152
    </varlistentry>
153
154
    <varlistentry>
138
    <varlistentry>
155
      <term><option>--memcached-servers</option></term>
139
      <term><option>--memcached-servers</option></term>
156
      <listitem>
140
      <listitem>
(-)a/debian/scripts/koha-create (-63 lines)
Lines 53-62 Options: Link Here
53
                            normarc and unimarc.
53
                            normarc and unimarc.
54
  --zebralang lang          Choose the primary language for Zebra indexing. Valid
54
  --zebralang lang          Choose the primary language for Zebra indexing. Valid
55
                            values are cs, en (default), es, fr, gr, nb, ru and uk.
55
                            values are cs, en (default), es, fr, gr, nb, ru and uk.
56
  --auth-idx idx_mode       Set the indexing mode for authority records. Valid
57
                            values are dom (default) and grs1.
58
  --biblio-idx idx_mode     Set the indexing mode for bibliographic records.
59
                            Valid values are dom (default) and grs1.
60
  --memcached-servers str   Set a comma-separated list of host:port memcached servers.
56
  --memcached-servers str   Set a comma-separated list of host:port memcached servers.
61
  --memcached-prefix str    Set the desired prefix for the instance memcached namespace.
57
  --memcached-prefix str    Set the desired prefix for the instance memcached namespace.
62
  --enable-sru              Enable the Z39.50/SRU server (default: disabled).
58
  --enable-sru              Enable the Z39.50/SRU server (default: disabled).
Lines 102-113 generate_config_file() { Link Here
102
        -e "s/__SRU_BIBLIOS_PORT__/$SRU_SERVER_PORT/g" \
98
        -e "s/__SRU_BIBLIOS_PORT__/$SRU_SERVER_PORT/g" \
103
        -e "s/__START_SRU_PUBLICSERVER__/$START_SRU_PUBLICSERVER/g" \
99
        -e "s/__START_SRU_PUBLICSERVER__/$START_SRU_PUBLICSERVER/g" \
104
        -e "s/__END_SRU_PUBLICSERVER__/$END_SRU_PUBLICSERVER/g" \
100
        -e "s/__END_SRU_PUBLICSERVER__/$END_SRU_PUBLICSERVER/g" \
105
        -e "s/__ZEBRA_BIBLIOS_CFG__/$ZEBRA_BIBLIOS_CFG/g" \
106
        -e "s/__ZEBRA_AUTHORITIES_CFG__/$ZEBRA_AUTHORITIES_CFG/g" \
107
        -e "s/__START_BIBLIOS_RETRIEVAL_INFO__/`echo $START_BIBLIOS_RETRIEVAL_INFO`/g" \
108
        -e "s/__END_BIBLIOS_RETRIEVAL_INFO__/`echo $END_BIBLIOS_RETRIEVAL_INFO`/g" \
109
        -e "s/__START_AUTHORITIES_RETRIEVAL_INFO__/`echo $START_AUTHORITIES_RETRIEVAL_INFO`/g" \
110
        -e "s/__END_AUTHORITIES_RETRIEVAL_INFO__/`echo $END_AUTHORITIES_RETRIEVAL_INFO`/g" \
111
        -e "s/__API_SECRET__/$API_SECRET/g" \
101
        -e "s/__API_SECRET__/$API_SECRET/g" \
112
        -e "s/__DB_NAME__/$mysqldb/g" \
102
        -e "s/__DB_NAME__/$mysqldb/g" \
113
        -e "s/__DB_HOST__/$mysqlhost/g" \
103
        -e "s/__DB_HOST__/$mysqlhost/g" \
Lines 224-269 EOM Link Here
224
214
225
}
215
}
226
216
227
set_biblios_indexing_mode()
228
{
229
    local marc_format=$1
230
231
    START_BIBLIOS_RETRIEVAL_INFO=`cat <<EOF
232
    <xi:include href="\/etc\/koha\/$marc_format-retrieval-info-bib-dom.xml"\n
233
                xmlns:xi="http:\/\/www.w3.org\/2001\/XInclude">\n
234
     <xi:fallback>\n
235
      <retrievalinfo>
236
EOF`
237
238
    END_BIBLIOS_RETRIEVAL_INFO=`cat <<EOF
239
      <\/retrievalinfo>\n
240
     <\/xi:fallback>\n
241
    <\/xi:include>
242
EOF`
243
    ZEBRA_BIBLIOS_CFG="zebra-biblios-dom.cfg"
244
}
245
246
247
set_authorities_indexing_mode()
248
{
249
    local marc_format=$1
250
251
    START_AUTHORITIES_RETRIEVAL_INFO=`cat <<EOF
252
    <xi:include href="\/etc\/koha\/$marc_format-retrieval-info-auth-dom.xml"\n
253
                xmlns:xi="http:\/\/www.w3.org\/2001\/XInclude">\n
254
     <xi:fallback>\n
255
      <retrievalinfo>
256
EOF`
257
258
    END_AUTHORITIES_RETRIEVAL_INFO=`cat <<EOF
259
      <\/retrievalinfo>\n
260
     <\/xi:fallback>\n
261
    <\/xi:include>\n
262
EOF`
263
    ZEBRA_AUTHORITIES_CFG="zebra-authorities-dom.cfg"
264
}
265
266
267
set_memcached()
217
set_memcached()
268
{
218
{
269
    local instance="$1"
219
    local instance="$1"
Lines 414-424 DEFAULT_SRU_SERVER_PORT="7090" Link Here
414
START_SRU_PUBLICSERVER="<!--"
364
START_SRU_PUBLICSERVER="<!--"
415
END_SRU_PUBLICSERVER="-->"
365
END_SRU_PUBLICSERVER="-->"
416
366
417
START_BIBLIOS_RETRIEVAL_INFO=""
418
END_BIBLIOS_RETRIEVAL_INFO=""
419
START_AUTHORITIES_RETRIEVAL_INFO=""
420
END_AUTHORITIES_RETRIEVAL_INFO=""
421
422
APACHE_CONFIGFILE=""
367
APACHE_CONFIGFILE=""
423
368
424
if [ -e /etc/koha/koha-sites.conf ]
369
if [ -e /etc/koha/koha-sites.conf ]
Lines 537-554 if [ "$CLO_TIMEZONE" != "" ]; then Link Here
537
    TIMEZONE=$CLO_TIMEZONE
482
    TIMEZONE=$CLO_TIMEZONE
538
fi
483
fi
539
484
540
if [ "$CLO_BIBLIOS_INDEXING_MODE" !=  "" ]; then
541
    BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE
542
fi
543
544
set_biblios_indexing_mode $ZEBRA_MARC_FORMAT
545
546
if [ "$ENABLE_SRU" != "no" ]; then
485
if [ "$ENABLE_SRU" != "no" ]; then
547
    enable_sru_server
486
    enable_sru_server
548
fi
487
fi
549
488
550
set_authorities_indexing_mode $ZEBRA_MARC_FORMAT
551
552
[ $# -ge 1 ] || ( usage ; die "Missing instance name..." )
489
[ $# -ge 1 ] || ( usage ; die "Missing instance name..." )
553
490
554
name="$1"
491
name="$1"
(-)a/debian/templates/koha-conf-site.xml.in (-11 / +25 lines)
Lines 18-24 __END_SRU_PUBLICSERVER__ 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>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
21
    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios-dom.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-35 __END_SRU_PUBLICSERVER__ 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-dom.cfg</config>
30
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
30
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
31
31
32
    __START_BIBLIOS_RETRIEVAL_INFO__
32
  <xi:include href="/etc/koha/__ZEBRA_MARC_FORMAT__-retrieval-info-bib-dom.xml"
33
              xmlns:xi="http://www.w3.org/2001/XInclude">
34
    <xi:fallback>
35
      <retrievalinfo>
33
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
36
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
34
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
37
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
35
       <retrieval syntax="xml" name="F"/>
38
       <retrieval syntax="xml" name="F"/>
Lines 76-82 __END_SRU_PUBLICSERVER__ Link Here
76
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
79
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
77
         </backend>
80
         </backend>
78
       </retrieval>
81
       </retrieval>
79
    __END_BIBLIOS_RETRIEVAL_INFO__
82
      </retrievalinfo>
83
    </xi:fallback>
84
  </xi:include>
80
85
81
    <!-- The stuff below is used to enable SRU. It's currently disabled
86
    <!-- The stuff below is used to enable SRU. It's currently disabled
82
         until we come up with a good way to make it get magically set up by
87
         until we come up with a good way to make it get magically set up by
Lines 104-113 __END_SRU_PUBLICSERVER__ Link Here
104
<!-- AUTHORITY RECORDS -->
109
<!-- AUTHORITY RECORDS -->
105
<server id="authorityserver"  listenref="authorityserver" >
110
<server id="authorityserver"  listenref="authorityserver" >
106
    <directory>/var/lib/koha/__KOHASITE__/authorities</directory>
111
    <directory>/var/lib/koha/__KOHASITE__/authorities</directory>
107
    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_AUTHORITIES_CFG__</config>
112
    <config>/etc/koha/sites/__KOHASITE__/zebra-authorities-dom.cfg</config>
108
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
113
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
109
114
110
    __START_AUTHORITIES_RETRIEVAL_INFO__
115
  <xi:include href="/etc/koha/__ZEBRA_MARC_FORMAT__-retrieval-info-auth-dom.xml"
116
              xmlns:xi="http://www.w3.org/2001/XInclude">
117
    <xi:fallback>
118
      <retrievalinfo>
111
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
119
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
112
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
120
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
113
       <retrieval syntax="xml" name="marcxml"
121
       <retrieval syntax="xml" name="marcxml"
Lines 145-151 __END_SRU_PUBLICSERVER__ Link Here
145
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
153
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
146
         </backend>
154
         </backend>
147
       </retrieval>
155
       </retrieval>
148
    __END_AUTHORITIES_RETRIEVAL_INFO__
156
      </retrievalinfo>
157
    </xi:fallback>
158
  </xi:include>
149
159
150
    <!-- The stuff below is used to enable SRU. It's currently disabled
160
    <!-- The stuff below is used to enable SRU. It's currently disabled
151
         until we come up with a good way to make it get magically set up by
161
         until we come up with a good way to make it get magically set up by
Lines 175-184 __END_SRU_PUBLICSERVER__ Link Here
175
__START_SRU_PUBLICSERVER__
185
__START_SRU_PUBLICSERVER__
176
<server id="publicserver"  listenref="publicserver">
186
<server id="publicserver"  listenref="publicserver">
177
    <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
187
    <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
178
    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
188
    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios-dom.cfg</config>
179
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
189
    <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
180
190
181
    __START_BIBLIOS_RETRIEVAL_INFO__
191
  <xi:include href="/etc/koha/__ZEBRA_MARC_FORMAT__-retrieval-info-bib-dom.xml"
192
              xmlns:xi="http://www.w3.org/2001/XInclude">
193
    <xi:fallback>
194
      <retrievalinfo>
182
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
195
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
183
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
196
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
184
       <retrieval syntax="xml" name="F"/>
197
       <retrieval syntax="xml" name="F"/>
Lines 225-231 __START_SRU_PUBLICSERVER__ Link Here
225
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
238
           <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
226
         </backend>
239
         </backend>
227
       </retrieval>
240
       </retrieval>
228
    __END_BIBLIOS_RETRIEVAL_INFO__
241
      </retrievalinfo>
242
    </xi:fallback>
243
  </xi:include>
229
244
230
    <xi:include href="/etc/koha/zebradb/explain-biblios.xml"
245
    <xi:include href="/etc/koha/zebradb/explain-biblios.xml"
231
                xmlns:xi="http://www.w3.org/2001/XInclude">
246
                xmlns:xi="http://www.w3.org/2001/XInclude">
232
- 

Return to bug 14302