kohabug 1776 - disable mergeserver if not installing PazPar2
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
parent
f20a58181b
commit
6835e192f4
2 changed files with 12 additions and 1 deletions
|
@ -13,12 +13,14 @@
|
|||
Because PazPar2 only connects to a Z39.50 server using TCP/IP,
|
||||
it cannot use the Unix-domain socket that biblioserver uses.
|
||||
Therefore, a custom server is defined. -->
|
||||
__PAZPAR2_TOGGLE_XML_PRE__
|
||||
<listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
|
||||
<server id="mergeserver" listenref="mergeserver">
|
||||
<directory>__ZEBRA_DATA_DIR__/biblios</directory>
|
||||
<config>__ZEBRA_CONF_DIR__/zebra-biblios.cfg</config>
|
||||
<cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
|
||||
</server>
|
||||
__PAZPAR2_TOGGLE_XML_POST__
|
||||
|
||||
<!-- BIBLIOGRAPHIC RECORDS -->
|
||||
<server id="biblioserver" listenref="biblioserver">
|
||||
|
|
|
@ -122,6 +122,8 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
|
|||
"__INSTALL_ZEBRA__" => 'yes',
|
||||
"__INSTALL_SRU__" => 'yes',
|
||||
"__INSTALL_PAZPAR2__" => 'no',
|
||||
"__PAZPAR2_TOGGLE_XML_PRE__" => '<!--',
|
||||
"__PAZPAR2_TOGGLE_XML_POST__" => '-->',
|
||||
"__AUTH_INDEX_MODE__" => 'grs1',
|
||||
);
|
||||
|
||||
|
@ -132,8 +134,15 @@ foreach $key (keys %configuration) {
|
|||
}
|
||||
}
|
||||
|
||||
# munge commenting out the PazPar2 mergeserver
|
||||
# entry in koha-conf.xml if necessary
|
||||
if ($configuration{'__INSTALL_PAZPAR2__'} eq 'yes') {
|
||||
$configuration{'__PAZPAR2_TOGGLE_XML_PRE__'} = '';
|
||||
$configuration{'__PAZPAR2_TOGGLE_XML_POST__'} = '';
|
||||
}
|
||||
|
||||
$fname = $ARGV[0];
|
||||
$file = read_file($fname);
|
||||
$file = &read_file($fname);
|
||||
$file =~ s/__.*?__/exists $configuration{$&} ? $configuration{$&} : $&/seg;
|
||||
|
||||
# At this point, file is in 'blib' and by default
|
||||
|
|
Loading…
Reference in a new issue