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

(-)a/Makefile.PL (+22 lines)
Lines 408-413 my %config_defaults = ( Link Here
408
  'INSTALL_SRU'       => 'yes',
408
  'INSTALL_SRU'       => 'yes',
409
  'INSTALL_PAZPAR2'   => 'no',
409
  'INSTALL_PAZPAR2'   => 'no',
410
  'AUTH_INDEX_MODE'   => 'dom',
410
  'AUTH_INDEX_MODE'   => 'dom',
411
  'BIB_INDEX_MODE'    => 'dom',
411
  'ZEBRA_MARC_FORMAT' => 'marc21',
412
  'ZEBRA_MARC_FORMAT' => 'marc21',
412
  'ZEBRA_LANGUAGE'    => 'en',
413
  'ZEBRA_LANGUAGE'    => 'en',
413
  'ZEBRA_TOKENIZER'   => 'chr',
414
  'ZEBRA_TOKENIZER'   => 'chr',
Lines 460-465 my %valid_config_values = ( Link Here
460
  'INSTALL_ZEBRA' => { 'yes' => 1, 'no' => 1 },
461
  'INSTALL_ZEBRA' => { 'yes' => 1, 'no' => 1 },
461
  'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 },
462
  'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 },
462
  'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 },
463
  'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 },
464
  'BIB_INDEX_MODE'  => { 'grs1' => 1, 'dom' => 1 },
463
  'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'normarc' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation
465
  'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'normarc' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation
464
  'ZEBRA_LANGUAGE'    => { 'en' => 1, 'fr' => 1, 'nb' => 1 }, # FIXME should generate from contents of distribution
466
  'ZEBRA_LANGUAGE'    => { 'en' => 1, 'fr' => 1, 'nb' => 1 }, # FIXME should generate from contents of distribution
465
  'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 },
467
  'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 },
Lines 501-512 if ($config{'INSTALL_ZEBRA'} eq "yes") { Link Here
501
    push @{ $pl_files->{'rewrite-config.PL'} }, (
503
    push @{ $pl_files->{'rewrite-config.PL'} }, (
502
        'blib/ZEBRA_CONF_DIR/etc/passwd',
504
        'blib/ZEBRA_CONF_DIR/etc/passwd',
503
        'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
505
        'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
506
        'blib/ZEBRA_CONF_DIR/zebra-biblios-dom.cfg',
504
        'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
507
        'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
505
        'blib/ZEBRA_CONF_DIR/zebra-authorities-dom.cfg',
508
        'blib/ZEBRA_CONF_DIR/zebra-authorities-dom.cfg',
506
        'blib/ZEBRA_CONF_DIR/explain-authorities.xml',
509
        'blib/ZEBRA_CONF_DIR/explain-authorities.xml',
507
        'blib/ZEBRA_CONF_DIR/explain-biblios.xml',
510
        'blib/ZEBRA_CONF_DIR/explain-biblios.xml',
508
        'blib/ZEBRA_CONF_DIR/retrieval-info-auth-grs1.xml',
511
        'blib/ZEBRA_CONF_DIR/retrieval-info-auth-grs1.xml',
509
        'blib/ZEBRA_CONF_DIR/retrieval-info-auth-dom.xml',
512
        'blib/ZEBRA_CONF_DIR/retrieval-info-auth-dom.xml',
513
        'blib/ZEBRA_CONF_DIR/retrieval-info-bib-grs1.xml',
514
        'blib/ZEBRA_CONF_DIR/retrieval-info-bib-dom.xml',
510
    );
515
    );
511
    push @{ $pl_files->{'rewrite-config.PL'} }, (
516
    push @{ $pl_files->{'rewrite-config.PL'} }, (
512
        'blib/SCRIPT_DIR/koha-zebra-ctl.sh',
517
        'blib/SCRIPT_DIR/koha-zebra-ctl.sh',
Lines 520-527 if ($config{'INSTALL_ZEBRA'} eq "yes") { Link Here
520
        );
525
        );
521
    }
526
    }
522
    $config{'ZEBRA_AUTH_CFG'} = $config{'AUTH_INDEX_MODE'} eq 'dom' ? 'zebra-authorities-dom.cfg' : 'zebra-authorities.cfg';
527
    $config{'ZEBRA_AUTH_CFG'} = $config{'AUTH_INDEX_MODE'} eq 'dom' ? 'zebra-authorities-dom.cfg' : 'zebra-authorities.cfg';
528
    $config{'ZEBRA_BIB_CFG'}  = $config{'BIB_INDEX_MODE'}  eq 'dom' ? 'zebra-biblios-dom.cfg'     : 'zebra-biblios.cfg';
523
    $config{'AUTH_RETRIEVAL_CFG'} =
529
    $config{'AUTH_RETRIEVAL_CFG'} =
524
        $config{'AUTH_INDEX_MODE'} eq 'dom' ? 'retrieval-info-auth-dom.xml' : 'retrieval-info-auth-grs1.xml';
530
        $config{'AUTH_INDEX_MODE'} eq 'dom' ? 'retrieval-info-auth-dom.xml' : 'retrieval-info-auth-grs1.xml';
531
    $config{'BIB_RETRIEVAL_CFG'}  =
532
        $config{'BIB_INDEX_MODE'}  eq 'dom' ? 'retrieval-info-bib-dom.xml'  : 'retrieval-info-bib-grs1.xml';
525
}
533
}
526
534
527
if ($config{'INSTALL_MODE'} ne "dev") {
535
if ($config{'INSTALL_MODE'} ne "dev") {
Lines 942-947 Primary language for Zebra indexing); Link Here
942
950
943
        $msg = q(
951
        $msg = q(
944
Koha can use one of  two different indexing modes
952
Koha can use one of  two different indexing modes
953
for the MARC bibliographic records:
954
955
grs1 - uses the Zebra GRS-1 filter, available
956
       for legacy support
957
dom  - uses the DOM XML filter; offers improved
958
       functionality.
959
960
Bibliographic indexing mode);
961
        $msg .= _add_valid_values_disp('BIB_INDEX_MODE', $valid_values);
962
        $config{'BIB_INDEX_MODE'} = _get_value('BIB_INDEX_MODE', $msg, $defaults->{'BIB_INDEX_MODE'}, $valid_values, $install_log_values);
963
964
965
        $msg = q(
966
Koha can use one of  two different indexing modes
945
for the MARC authorities records:
967
for the MARC authorities records:
946
968
947
grs1 - uses the Zebra GRS-1 filter, available
969
grs1 - uses the Zebra GRS-1 filter, available
(-)a/etc/koha-conf.xml (-3 / +13 lines)
Lines 27-33 __PAZPAR2_TOGGLE_XML_PRE__ Link Here
27
<listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
27
<listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
28
<server id="mergeserver"  listenref="mergeserver"> 
28
<server id="mergeserver"  listenref="mergeserver"> 
29
    <directory>__ZEBRA_DATA_DIR__/biblios</directory>
29
    <directory>__ZEBRA_DATA_DIR__/biblios</directory>
30
    <config>__ZEBRA_CONF_DIR__/zebra-biblios.cfg</config>
30
    <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
31
    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
31
    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
32
</server>
32
</server>
33
__PAZPAR2_TOGGLE_XML_POST__
33
__PAZPAR2_TOGGLE_XML_POST__
Lines 35-45 __PAZPAR2_TOGGLE_XML_POST__ Link Here
35
<!-- BIBLIOGRAPHIC RECORDS -->
35
<!-- BIBLIOGRAPHIC RECORDS -->
36
<server id="biblioserver"  listenref="biblioserver"> 
36
<server id="biblioserver"  listenref="biblioserver"> 
37
    <directory>__ZEBRA_DATA_DIR__/biblios</directory>
37
    <directory>__ZEBRA_DATA_DIR__/biblios</directory>
38
    <config>__ZEBRA_CONF_DIR__/zebra-biblios.cfg</config>
38
    <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
39
    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
39
    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
40
     <!-- <docpath>xsl</docpath> -->
40
     <!-- <docpath>xsl</docpath> -->
41
     <!-- <stylesheet>xsl/default.xsl</stylesheet> -->
41
     <!-- <stylesheet>xsl/default.xsl</stylesheet> -->
42
     <!-- <maximumrecordsize>2000000</maximumrecordsize> -->
42
     <!-- <maximumrecordsize>2000000</maximumrecordsize> -->
43
    <xi:include href="__KOHA_CONF_DIR__/zebradb/__BIB_RETRIEVAL_CFG__"
44
                xmlns:xi="http://www.w3.org/2001/XInclude">
45
      <xi:fallback>
43
     <retrievalinfo>
46
     <retrievalinfo>
44
       <retrieval syntax="usmarc" name="F"/>
47
       <retrieval syntax="usmarc" name="F"/>
45
       <retrieval syntax="usmarc" name="B"/>
48
       <retrieval syntax="usmarc" name="B"/>
Lines 88-93 __PAZPAR2_TOGGLE_XML_POST__ Link Here
88
         </backend>
91
         </backend>
89
       </retrieval>
92
       </retrieval>
90
     </retrievalinfo>
93
     </retrievalinfo>
94
      </xi:fallback>
95
      </xi:include>
91
    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
96
    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
92
                xmlns:xi="http://www.w3.org/2001/XInclude">
97
                xmlns:xi="http://www.w3.org/2001/XInclude">
93
      <xi:fallback>
98
      <xi:fallback>
Lines 182-189 __PAZPAR2_TOGGLE_XML_POST__ Link Here
182
<!--
187
<!--
183
<server id="publicserver"  listenref="publicserver"> 
188
<server id="publicserver"  listenref="publicserver"> 
184
    <directory>__ZEBRA_DATA_DIR__/biblios</directory>
189
    <directory>__ZEBRA_DATA_DIR__/biblios</directory>
185
    <config>__ZEBRA_CONF_DIR__/zebra-biblios.cfg</config>
190
    <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
186
    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
191
    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
192
    <xi:include href="__KOHA_CONF_DIR__/zebradb/__AUTH_RETRIEVAL_CFG__"
193
                xmlns:xi="http://www.w3.org/2001/XInclude">
194
      <xi:fallback>
187
     <retrievalinfo>
195
     <retrievalinfo>
188
       <retrieval syntax="usmarc" name="F"/>
196
       <retrieval syntax="usmarc" name="F"/>
189
       <retrieval syntax="usmarc" name="B"/>
197
       <retrieval syntax="usmarc" name="B"/>
Lines 232-237 __PAZPAR2_TOGGLE_XML_POST__ Link Here
232
         </backend>
240
         </backend>
233
       </retrieval>
241
       </retrieval>
234
     </retrievalinfo>
242
     </retrievalinfo>
243
      </xi:fallback>
244
    </xi:include>
235
    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
245
    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
236
                xmlns:xi="http://www.w3.org/2001/XInclude">
246
                xmlns:xi="http://www.w3.org/2001/XInclude">
237
      <xi:fallback>
247
      <xi:fallback>
(-)a/etc/zebradb/biblios/etc/dom-config-marc.xml (+54 lines)
Line 0 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
3
<!-- 
4
$Id: dom-config.xml,v 1.1 2007-12-13 17:42:28 adam Exp $
5
   Copyright (C) 1995-2006
6
   Index Data ApS
7
8
This file is part of the Zebra server.
9
10
Zebra is free software; you can redistribute it and/or modify it under
11
the terms of the GNU General Public License as published by the Free
12
Software Foundation; either version 2, or (at your option) any later
13
version.
14
15
Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
16
WARRANTY; without even the implied warranty of MERCHANTABILITY or
17
FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
18
for more details.
19
20
You should have received a copy of the GNU General Public License
21
along with Zebra; see the file LICENSE.zebra.  If not, write to the
22
Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, 
23
MA 02110-1301 USA.
24
-->
25
26
<!--
27
Bibliographic DOM config for MARC ISO2709 input
28
-->
29
<dom>
30
  <extract name="index">
31
    <xslt stylesheet="biblio-zebra-indexdefs.xsl"/>
32
  </extract>
33
  <retrieve name="F">
34
    <xslt stylesheet="identity.xsl" />
35
  </retrieve>
36
  <retrieve name="usmarc">
37
    <xslt stylesheet="identity.xsl" />
38
  </retrieve>
39
  <retrieve name="marc">
40
    <xslt stylesheet="identity.xsl" />
41
  </retrieve>
42
  <retrieve name="marcxml">
43
    <xslt stylesheet="identity.xsl" />
44
  </retrieve>
45
  <retrieve name="zebra">
46
    <xslt stylesheet="zebra.xsl"/>
47
  </retrieve>
48
  <retrieve name="index">
49
    <xslt stylesheet="biblio-zebra-indexdefs.xsl"/>
50
  </retrieve>
51
  <input>
52
    <marc inputcharset="utf-8"/>
53
  </input>
54
</dom>
(-)a/etc/zebradb/biblios/etc/dom-config.xml (+54 lines)
Line 0 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
3
<!-- 
4
$Id: dom-config.xml,v 1.1 2007-12-13 17:42:28 adam Exp $
5
   Copyright (C) 1995-2006
6
   Index Data ApS
7
8
This file is part of the Zebra server.
9
10
Zebra is free software; you can redistribute it and/or modify it under
11
the terms of the GNU General Public License as published by the Free
12
Software Foundation; either version 2, or (at your option) any later
13
version.
14
15
Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
16
WARRANTY; without even the implied warranty of MERCHANTABILITY or
17
FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
18
for more details.
19
20
You should have received a copy of the GNU General Public License
21
along with Zebra; see the file LICENSE.zebra.  If not, write to the
22
Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, 
23
MA 02110-1301 USA.
24
-->
25
26
<!--
27
Bibliographic DOM config for MARC XML input
28
-->
29
<dom>
30
  <extract name="index">
31
    <xslt stylesheet="biblio-zebra-indexdefs.xsl"/>
32
  </extract>
33
  <retrieve name="F">
34
    <xslt stylesheet="identity.xsl" />
35
  </retrieve>
36
  <retrieve name="usmarc">
37
    <xslt stylesheet="identity.xsl" />
38
  </retrieve>
39
  <retrieve name="marc">
40
    <xslt stylesheet="identity.xsl" />
41
  </retrieve>
42
  <retrieve name="marcxml">
43
    <xslt stylesheet="identity.xsl" />
44
  </retrieve>
45
  <retrieve name="zebra">
46
    <xslt stylesheet="zebra.xsl"/>
47
  </retrieve>
48
  <retrieve name="index">
49
    <xslt stylesheet="biblio-zebra-indexdefs.xsl"/>
50
  </retrieve>
51
  <input>
52
    <xmlreader level="0"/>
53
  </input>
54
</dom>
(-)a/etc/zebradb/retrieval-info-bib-dom.xml (+22 lines)
Line 0 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<retrievalinfo xmlns="http://indexdata.com/yaz">
3
  <retrieval syntax="usmarc" name="F">
4
    <backend syntax="xml" name="marc">
5
      <marc inputformat="xml" outputformat="marc"
6
            inputcharset="utf-8"
7
            outputcharset="utf-8"/>
8
    </backend>
9
  </retrieval>
10
  <retrieval syntax="usmarc" name="B">
11
    <backend syntax="xml" name="marc">
12
      <marc inputformat="xml" outputformat="marc"
13
            inputcharset="utf-8"
14
            outputcharset="utf-8"/>
15
    </backend>
16
  </retrieval>
17
  <retrieval syntax="xml" name="index"/> <!-- allow viewing index entries -->
18
  <retrieval syntax="xml" name="marc"
19
             identifier="info:srw/schema/1/marcxml-v1.1"/>
20
  <retrieval syntax="xml" name="marcxml"
21
             identifier="info:srw/schema/1/marcxml-v1.1"/>
22
</retrievalinfo>
(-)a/etc/zebradb/retrieval-info-bib-grs1.xml (+40 lines)
Line 0 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<retrievalinfo xmlns="http://indexdata.com/yaz">
3
  <retrieval syntax="usmarc" name="F"/>
4
  <retrieval syntax="usmarc" name="B"/>
5
  <retrieval syntax="xml" name="marcxml"
6
             identifier="info:srw/schema/1/marcxml-v1.1">
7
    <backend syntax="usmarc" name="F">
8
      <marc inputformat="marc" outputformat="marcxml"
9
            inputcharset="utf-8"/>
10
    </backend>
11
  </retrieval>
12
  <retrieval syntax="xml" name="dc">
13
    <backend syntax="usmarc" name="F">
14
      <marc inputformat="marc" outputformat="marcxml"
15
            inputcharset="utf-8"/>
16
      <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
17
    </backend>
18
  </retrieval>
19
  <retrieval syntax="xml" name="mods">
20
    <backend syntax="usmarc" name="F">
21
      <marc inputformat="marc" outputformat="marcxml"
22
            inputcharset="utf-8"/>
23
      <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
24
    </backend>
25
  </retrieval>
26
  <retrieval syntax="xml" name="rdfdc">
27
    <backend syntax="usmarc" name="F">
28
      <marc inputformat="marc" outputformat="marcxml"
29
            inputcharset="utf-8"/>
30
      <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
31
    </backend>
32
  </retrieval>
33
  <retrieval syntax="xml" name="utils">
34
    <backend syntax="usmarc" name="F">
35
      <marc inputformat="marc" outputformat="marcxml"
36
            inputcharset="utf-8"/>
37
      <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
38
    </backend>
39
  </retrieval>
40
</retrievalinfo>
(-)a/etc/zebradb/zebra-biblios-dom.cfg (+55 lines)
Line 0 Link Here
1
# Simple Zebra configuration file that defines
2
# a database with MARCXML records.
3
# $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
4
#
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
7
# modulePath - where to look for loadable zebra modules
8
modulePath: /usr/lib/idzebra-2.0/modules
9
10
encoding: UTF-8
11
# Files that describe the attribute sets supported.
12
attset: bib1.att
13
attset: explain.att
14
attset: gils.att
15
16
# systag sysno rank
17
18
# Specify record type
19
# group   .recordType[  .name  ]:  type
20
# type is split into fundamental type. file-read-type . argument
21
# http://www.indexdata.dk/zebra/doc/zebra-cfg.tkl
22
# http://www.indexdata.dk/zebra/doc/grs.tkl
23
24
recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config.xml
25
marcxml.recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config.xml
26
iso2709.recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config-marc.xml
27
28
recordId: (bib1,Local-number)
29
storeKeys:1
30
storeData:1
31
32
33
# Lock File Area
34
lockDir: __ZEBRA_LOCK_DIR__/biblios
35
perm.anonymous:ar
36
perm.__ZEBRA_USER__:rw
37
passwd: __ZEBRA_CONF_DIR__/etc/passwd
38
register: __ZEBRA_DATA_DIR__/biblios/register:20G
39
shadow: __ZEBRA_DATA_DIR__/biblios/shadow:20G
40
41
# Temp File area for result sets
42
setTmpDir: __ZEBRA_DATA_DIR__/biblios/tmp
43
44
# Temp File area for index program
45
keyTmpDir: __ZEBRA_DATA_DIR__/biblios/key
46
47
# Approx. Memory usage during indexing
48
memMax: 50M
49
rank:rank-1
50
truncmax: 1000000000
51
52
# Specifies the maximum number of records that will be sorted in a result set.
53
# If the result set contains more than that limit, the records after the limit
54
# will not be sorted. If omitted, the default value is 1,000.
55
sortmax: 1000
(-)a/misc/koha-install-log (-1 / +3 lines)
Lines 44-50 ZEBRA_RUN_DIR=__ZEBRA_RUN_DIR__ Link Here
44
ZEBRA_MARC_FORMAT=__ZEBRA_MARC_FORMAT__
44
ZEBRA_MARC_FORMAT=__ZEBRA_MARC_FORMAT__
45
ZEBRA_LANGUAGE=__ZEBRA_LANGUAGE__
45
ZEBRA_LANGUAGE=__ZEBRA_LANGUAGE__
46
ZEBRA_AUTH_CFG=__ZEBRA_AUTH_CFG__
46
ZEBRA_AUTH_CFG=__ZEBRA_AUTH_CFG__
47
ZEBRA_BIB_CFG=__ZEBRA_BIB_CFG__
47
AUTH_RETRIEVAL_CFG=__AUTH_RETRIEVAL_CFG__
48
AUTH_RETRIEVAL_CFG=__AUTH_RETRIEVAL_CFG__
49
BIB_RETRIEVAL_CFG=__BIB_RETRIEVAL_CFG__
48
MERGE_SERVER_HOST=__MERGE_SERVER_HOST__
50
MERGE_SERVER_HOST=__MERGE_SERVER_HOST__
49
MERGE_SERVER_PORT=__MERGE_SERVER_PORT__
51
MERGE_SERVER_PORT=__MERGE_SERVER_PORT__
50
PAZPAR2_HOST=__PAZPAR2_HOST__
52
PAZPAR2_HOST=__PAZPAR2_HOST__
Lines 54-60 INSTALL_BASE=__INSTALL_BASE__ Link Here
54
INSTALL_ZEBRA=__INSTALL_ZEBRA__
56
INSTALL_ZEBRA=__INSTALL_ZEBRA__
55
INSTALL_SRU=__INSTALL_SRU__
57
INSTALL_SRU=__INSTALL_SRU__
56
INSTALL_PAZPAR2=__INSTALL_PAZPAR2__
58
INSTALL_PAZPAR2=__INSTALL_PAZPAR2__
57
AUTH_INDEX_MODE=__AUTH_INDEX_MODE__
59
BIB_INDEX_MODE=__BIB_INDEX_MODE__
58
RUN_DATABASE_TESTS=__RUN_DATABASE_TESTS__
60
RUN_DATABASE_TESTS=__RUN_DATABASE_TESTS__
59
PATH_TO_ZEBRA=__PATH_TO_ZEBRA__
61
PATH_TO_ZEBRA=__PATH_TO_ZEBRA__
60
USE_MEMCACHED=__USE_MEMCACHED__
62
USE_MEMCACHED=__USE_MEMCACHED__
(-)a/rewrite-config.PL (-1 / +3 lines)
Lines 122-128 $prefix = $ENV{'INSTALL_BASE'} || "/usr"; Link Here
122
  '__ZEBRA_LANGUAGE__' => 'en',
122
  '__ZEBRA_LANGUAGE__' => 'en',
123
  '__ZEBRA_TOKENIZER_STMT__' => 'charmap word-phrase-utf.chr',
123
  '__ZEBRA_TOKENIZER_STMT__' => 'charmap word-phrase-utf.chr',
124
  '__ZEBRA_AUTH_CFG__' => 'zebra-authorities.cfg',
124
  '__ZEBRA_AUTH_CFG__' => 'zebra-authorities.cfg',
125
  '__ZEBRA_BIB_CFG__' => 'zebra-biblios.cfg',
125
  '__AUTH_RETRIEVAL_CFG__' => 'retrieval-info-auth-grs1.xml',
126
  '__AUTH_RETRIEVAL_CFG__' => 'retrieval-info-auth-grs1.xml',
127
  '__BIB_RETRIEVAL_CFG__' => 'retrieval-info-bib-grs1.xml',
126
  "__MERGE_SERVER_HOST__" => $myhost,
128
  "__MERGE_SERVER_HOST__" => $myhost,
127
  "__MERGE_SERVER_PORT__" => '11001',
129
  "__MERGE_SERVER_PORT__" => '11001',
128
  "__PAZPAR2_HOST__" => $myhost,
130
  "__PAZPAR2_HOST__" => $myhost,
Lines 135-140 $prefix = $ENV{'INSTALL_BASE'} || "/usr"; Link Here
135
  "__PAZPAR2_TOGGLE_XML_PRE__" => '<!--',
137
  "__PAZPAR2_TOGGLE_XML_PRE__" => '<!--',
136
  "__PAZPAR2_TOGGLE_XML_POST__" => '-->',
138
  "__PAZPAR2_TOGGLE_XML_POST__" => '-->',
137
  "__AUTH_INDEX_MODE__" => 'grs1',
139
  "__AUTH_INDEX_MODE__" => 'grs1',
140
  "__BIB_INDEX_MODE__" => 'grs1',
138
  "__RUN_DATABASE_TESTS__" => 'no',
141
  "__RUN_DATABASE_TESTS__" => 'no',
139
  "__PATH_TO_ZEBRA__" => "",
142
  "__PATH_TO_ZEBRA__" => "",
140
  "__USE_MEMCACHED__" => 'no',
143
  "__USE_MEMCACHED__" => 'no',
141
- 

Return to bug 7818