Permalink
Browse files

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 <jmf@liblime.com>
  • Loading branch information...
1 parent 896754d commit bbd043f1552e99e48bdbf70de9ef680120f8e185 Joshua Ferraro committed Jan 4, 2008
Showing with 57 additions and 15 deletions.
  1. +41 −3 Makefile.PL
  2. +4 −4 etc/koha-conf.xml
  3. +4 −4 etc/zebradb/explain-authorities.xml
  4. +4 −4 etc/zebradb/explain-biblios.xml
  5. +1 −0 opac/unapi
  6. +3 −0 rewrite-config.PL
View
@@ -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";
View
@@ -68,8 +68,8 @@
<xi:fallback>
<explain xmlns="http://explain.z3950.org/dtd/2.0/">
<serverInfo>
- <host>__WEBSERVER_HOST__</host>
- <port>9999</port>
+ <host>__ZEBRA_SRU_HOST__</host>
+ <port>__ZEBRA_SRU_BIBLIOS_PORT__</port>
<database>biblios</database>
</serverInfo>
</explain>
@@ -134,8 +134,8 @@
<xi:fallback>
<explain xmlns="http://explain.z3950.org/dtd/2.0/">
<serverInfo>
- <host>__WEBSERVER_HOST__</host>
- <port>9999</port>
+ <host>__ZEBRA_SRU_HOST__</host>
+ <port>__ZEBRA_SRU_AUTHORITIES_PORT__</port>
<database>authorities</database>
</serverInfo>
</explain>
@@ -12,7 +12,7 @@
<!-- try stylesheet url: http://./?stylesheet=docpath/sru2.xsl -->
<serverInfo protocol="SRW/SRU/Z39.50">
- <host>__WEBSERVER_HOST__</host>
+ <host>__ZEBRA_SRU_HOST__</host>
<port>9999</port>
<!-- <database numRecs="1314" lastUpdate="2006-03-15 09-05-33">
@@ -55,9 +55,9 @@
<links>
<!--<link type="www">http://foo.indexdata.dk:80</link>-->
- <link type="z39.50">http://__WEBSERVER_HOST__:9999</link>
- <link type="srw">http://__WEBSERVER_HOST__:9999</link>
- <link type="sru">http://__WEBSERVER_HOST__:9999</link>
+ <link type="z39.50">http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_AUTHORITIES_PORT__</link>
+ <link type="srw">http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_AUTHORITIES_PORT__</link>
+ <link type="sru">http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_AUTHORITIES_PORT__</link>
<!--<link type="oai"></link>
<link type="rss"></link>
<link type="icon"></link> -->
@@ -12,7 +12,7 @@
<!-- try stylesheet url: http://./?stylesheet=docpath/sru2.xsl -->
<serverInfo protocol="SRW/SRU/Z39.50">
- <host>__WEBSERVER_HOST__</host>
+ <host>__ZEBRA_SRU_HOST__</host>
<port>9999</port>
<!-- <database numRecs="1314" lastUpdate="2006-03-15 09-05-33">
@@ -55,9 +55,9 @@
<links>
<!--<link type="www">http://foo.indexdata.dk:80</link>-->
- <link type="z39.50">http://__WEBSERVER_HOST__:9999</link>
- <link type="srw">http://__WEBSERVER_HOST__:9999</link>
- <link type="sru">http://__WEBSERVER_HOST__:9999</link>
+ <link type="z39.50">http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_BIBLIOS_PORT__</link>
+ <link type="srw">http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_BIBLIOS_PORT__</link>
+ <link type="sru">http://__ZEBRA_SRU_HOST__:__ZEBRA_SRU_BIBLIOS_PORT__</link>
<!--<link type="oai"></link>
<link type="rss"></link>
<link type="icon"></link> -->
View
@@ -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');
View
@@ -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",

0 comments on commit bbd043f

Please sign in to comment.