From bbd043f1552e99e48bdbf70de9ef680120f8e185 Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Thu, 3 Jan 2008 21:17:02 -0500 Subject: [PATCH] adding three new variables for installation: 'ZEBRA_SRU_HOST' => 'localhost', 'ZEBRA_SRU_BIBLIOS_PORT' => '9998', 'ZEBRA_SRU_AUTHORITIES_PORT' => '9999', Signed-off-by: Joshua Ferraro --- Makefile.PL | 44 +++++++++++++++++++++++++++-- etc/koha-conf.xml | 8 +++--- etc/zebradb/explain-authorities.xml | 8 +++--- etc/zebradb/explain-biblios.xml | 8 +++--- opac/unapi | 1 + rewrite-config.PL | 3 ++ 6 files changed, 57 insertions(+), 15 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index d050c1f216..98b000b1a3 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -244,8 +244,7 @@ my $target_map = { './members' => 'INTRANET_CGI_DIR', './misc' => { target => 'SCRIPT_DIR', trimdir => -1 }, './misc/bin' => { target => 'SCRIPT_DIR', trimdir => -1 }, - './misc/info' => { target => 'DOC_DIR', trimdir => 2 }, - './misc/release notes' => { target => 'DOC_DIR', trimdir => 2 }, + './misc/release_notes' => { target => 'DOC_DIR', trimdir => 2 }, './misc/translator' => { target => 'MISC_DIR', trimdir => 2 }, './misc/installer_devel_notes' => 'NONE', './opac' => 'OPAC_CGI_DIR', @@ -370,10 +369,14 @@ my %config_defaults = ( 'DB_USER' => 'kohaadmin', 'DB_PASS' => 'katikoan', 'INSTALL_ZEBRA' => 'yes', + 'INSTALL_SRU' => 'yes', 'ZEBRA_MARC_FORMAT' => 'marc21', 'ZEBRA_LANGUAGE' => 'en', 'ZEBRA_USER' => 'kohauser', 'ZEBRA_PASS' => 'zebrastripes', + 'ZEBRA_SRU_HOST' => 'localhost', + 'ZEBRA_SRU_BIBLIOS_PORT' => '9998', + 'ZEBRA_SRU_AUTHORITIES_PORT' => '9999', 'KOHA_USER' => 'koha', 'KOHA_GROUP' => 'koha', ); @@ -407,6 +410,7 @@ my %valid_config_values = ( 'INSTALL_MODE' => { 'standard' => 1, 'single' => 1, 'dev' => 1 }, 'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 }, 'INSTALL_ZEBRA' => { 'yes' => 1, 'no' => 1 }, + 'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 }, 'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation 'ZEBRA_LANGUAGE' => { 'en' => 1, 'fr' => 1 }, # FIXME should generate from contents of distribution ); @@ -431,7 +435,9 @@ if ($config{'INSTALL_ZEBRA'} eq "yes") { push @{ $pl_files->{'rewrite-config.PL'} }, ( 'blib/ZEBRA_CONF_DIR/etc/passwd', 'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg', - 'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg' + 'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg', + 'blib/ZEBRA_CONF_DIR/explain-authorities.xml', + 'blib/ZEBRA_CONF_DIR/explain-biblios.xml' ); if ($config{'INSTALL_MODE'} ne 'dev') { push @{ $pl_files->{'rewrite-config.PL'} }, ( @@ -866,6 +872,38 @@ Please specify Zebra database user); Please specify the Zebra database password); $config{'ZEBRA_PASS'} = _get_value('ZEBRA_PASS', $msg, $defaults->{'ZEBRA_PASS'}, $valid_values); + $msg = q( +Since you've chosen to use Zebra, you can enable the SRU/ +Z39.50 Server if you so choose, but you must specify a +few configuration options for it. + +Please note that if you choose *NOT* to configure SRU, +koha-conf.xml will still contain some references to SRU +settings. Those references will be ignored by Koha. + +Install the SRU configuration files?); + $msg .= _add_valid_values_disp('INSTALL_SRU', $valid_values); + $config{'INSTALL_SRU'} = _get_value('INSTALL_SRU', $msg, $defaults->{'INSTALL_SRU'}, $valid_values); + + if ($config{'INSTALL_SRU'} eq 'yes') { + $msg = q( +Since you've chosen to configure SRU, you must +specify the host and port(s) that the SRU +Servers (bibliographic and authority) should run on. +); + $msg = q( +SRU Database host?); + $config{'ZEBRA_SRU_HOST'} = _get_value('ZEBRA_SRU_HOST', $msg, $defaults->{'ZEBRA_SRU_HOST'}, $valid_values); + + $msg = q( +SRU port for bibliographic data?); + $config{'ZEBRA_SRU_BIBLIOS_PORT'} = _get_value('ZEBRA_SRU_BIBLIOS_PORT', $msg, $defaults->{'ZEBRA_SRU_BIBLIOS_PORT'}, $valid_values); + + $msg = q( +SRU port for authority data?); + $config{'ZEBRA_SRU_AUTHORITIES_PORT'} = _get_value('ZEBRA_SRU_AUTHORITIES_PORT', $msg, $defaults->{'ZEBRA_SRU_AUTHORITIES_PORT'}, $valid_values); + + } } print "\n\n"; diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml index a4d363d701..4ef0eb70f6 100644 --- a/etc/koha-conf.xml +++ b/etc/koha-conf.xml @@ -68,8 +68,8 @@ - __WEBSERVER_HOST__ - 9999 + __ZEBRA_SRU_HOST__ + __ZEBRA_SRU_BIBLIOS_PORT__ biblios @@ -134,8 +134,8 @@ - __WEBSERVER_HOST__ - 9999 + __ZEBRA_SRU_HOST__ + __ZEBRA_SRU_AUTHORITIES_PORT__ authorities diff --git a/etc/zebradb/explain-authorities.xml b/etc/zebradb/explain-authorities.xml index c6d5fcc941..6455fc06d6 100644 --- a/etc/zebradb/explain-authorities.xml +++ b/etc/zebradb/explain-authorities.xml @@ -12,7 +12,7 @@ - __WEBSERVER_HOST__ + __ZEBRA_SRU_HOST__ 9999 - http://__WEBSERVER_HOST__:9999 - http://__WEBSERVER_HOST__:9999 - http://__WEBSERVER_HOST__:9999 + http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_AUTHORITIES_PORT__ + http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_AUTHORITIES_PORT__ + http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_AUTHORITIES_PORT__ diff --git a/etc/zebradb/explain-biblios.xml b/etc/zebradb/explain-biblios.xml index e883e3837d..10b9fa5e55 100644 --- a/etc/zebradb/explain-biblios.xml +++ b/etc/zebradb/explain-biblios.xml @@ -12,7 +12,7 @@ - __WEBSERVER_HOST__ + __ZEBRA_SRU_HOST__ 9999 - http://__WEBSERVER_HOST__:9999 - http://__WEBSERVER_HOST__:9999 - http://__WEBSERVER_HOST__:9999 + http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_BIBLIOS_PORT__ + http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_BIBLIOS_PORT__ + http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_BIBLIOS_PORT__ diff --git a/opac/unapi b/opac/unapi index a51f9faf31..1197be5422 100755 --- a/opac/unapi +++ b/opac/unapi @@ -12,6 +12,7 @@ use HTTP::Request::Common; my $cgi = new CGI; binmode(STDOUT, "utf8"); #output as utf8 my $baseurl = C4::Context->preference('OPACBaseURL'); +warn "Warning: OPACBaseURL not set in system preferences" unless $baseurl; my $id = $cgi->param('id'); my $format = $cgi->param('format'); diff --git a/rewrite-config.PL b/rewrite-config.PL index 804849215c..a55ed1f81c 100644 --- a/rewrite-config.PL +++ b/rewrite-config.PL @@ -84,6 +84,9 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr"; "__WEBSERVER_IP__" => $myip, "__WEBSERVER_PORT__" => "80", "__WEBSERVER_PORT_LIBRARIAN__" => "8080", + "__ZEBRA_SRU_HOST__" => $myhost, + "__ZEBRA_SRU_BIBLIOS_PORT__" => "9998", + "__ZEBRA_SRU_AUTHORITIES_PORT__" => "9999", "__KOHA_USER__" => "koha", "__KOHA_GROUP__" => "koha", "__ZEBRA_PASS__" => "zebrastripes", -- 2.20.1