r11523@llin: dpavlin | 2005-12-05 01:22:00 +0100

[webpac2] / lib / WebPAC / Search / Estraier.pm

diff --git a/lib/WebPAC/Search/Estraier.pm b/lib/WebPAC/Search/Estraier.pm
index 1647953..0403ea4 100644 (file)
--- a/lib/WebPAC/Search/Estraier.pm
+++ b/lib/WebPAC/Search/Estraier.pm
@@ -13,11 +13,11 @@ WebPAC::Search::Estraier - search Hyper Estraier full text index
 
 =head1 VERSION
 
-Version 0.03
+Version 0.04
 
 =cut
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 =head1 SYNOPSIS
 
@@ -31,7 +31,8 @@ L<WebPAC::Output::Estraier>.
 Connect to Hyper Estraier index using HTTP
 
  my $est = new WebPAC::Search::Estraier(
-       url => 'http://localhost:1978/node/webpac2',
+       masterurl => 'http://localhost:1978/',
+       database => 'webpac2',
        user => 'admin',
        passwd => 'admin',
        encoding => 'iso-8859-2',
@@ -42,10 +43,14 @@ Options are:
 
 =over 4
 
-=item url
+=item maseterurl
 
 URI to C<estmaster> node
 
+=item database
+
+name of C<estmaster> node
+
 =item user
 
 C<estmaster> user with read rights
@@ -76,10 +81,14 @@ sub new {
 
        my $log = $self->_get_logger;
 
-       foreach my $p (qw/url user passwd/) {
+       foreach my $p (qw/masterurl user passwd/) {
                $log->logdie("need $p") unless ($self->{$p});
        }
 
+       my $url = $self->{masterurl} . '/node/' . $self->{database};
+       $url =~ s#//#/#g;
+       $self->{url} = $url;
+
        $log->info("opening Hyper Estraier index $self->{'url'} as $self->{'user'}");
 
        $self->{'db'} = HyperEstraier::Node->new($self->{'url'});