Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

kohabug 1776 - disable mergeserver if not installing PazPar2

Browse source 
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Galen Charlton 2008-04-21 18:00:52 -05:00 committed by Joshua Ferraro
parent f20a58181b
commit 6835e192f4
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/koha-conf.xml
View file

@ -13,12 +13,14 @@
Because PazPar2 only connects to a Z39.50 server using TCP/IP, Because PazPar2 only connects to a Z39.50 server using TCP/IP,
it cannot use the Unix-domain socket that biblioserver uses. it cannot use the Unix-domain socket that biblioserver uses.
Therefore, a custom server is defined. --> Therefore, a custom server is defined. -->
__PAZPAR2_TOGGLE_XML_PRE__
<listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen> <listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
<server id="mergeserver" listenref="mergeserver"> <server id="mergeserver" listenref="mergeserver">
<directory>__ZEBRA_DATA_DIR__/biblios</directory> <directory>__ZEBRA_DATA_DIR__/biblios</directory>
<config>__ZEBRA_CONF_DIR__/zebra-biblios.cfg</config> <config>__ZEBRA_CONF_DIR__/zebra-biblios.cfg</config>
<cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn> <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
</server> </server>
__PAZPAR2_TOGGLE_XML_POST__
<!-- BIBLIOGRAPHIC RECORDS --> <!-- BIBLIOGRAPHIC RECORDS -->
<server id="biblioserver" listenref="biblioserver"> <server id="biblioserver" listenref="biblioserver">

11
rewrite-config.PL
View file

@ -122,6 +122,8 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
"__INSTALL_ZEBRA__" => 'yes', "__INSTALL_ZEBRA__" => 'yes',
"__INSTALL_SRU__" => 'yes', "__INSTALL_SRU__" => 'yes',
"__INSTALL_PAZPAR2__" => 'no', "__INSTALL_PAZPAR2__" => 'no',
"__PAZPAR2_TOGGLE_XML_PRE__" => '<!--',
"__PAZPAR2_TOGGLE_XML_POST__" => '-->',
"__AUTH_INDEX_MODE__" => 'grs1', "__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]; $fname = $ARGV[0];
$file = read_file($fname); $file = &read_file($fname);
$file =~ s/__.*?__/exists $configuration{$&} ? $configuration{$&} : $&/seg; $file =~ s/__.*?__/exists $configuration{$&} ? $configuration{$&} : $&/seg;
# At this point, file is in 'blib' and by default # At this point, file is in 'blib' and by default