--- trunk/lib/WebPAC/Output/Estraier.pm	2005/11/20 20:13:39	74
+++ trunk/lib/WebPAC/Output/Estraier.pm	2005/12/14 23:04:59	245
@@ -8,6 +8,8 @@
 use HyperEstraier;
 use Text::Iconv;
 use Data::Dumper;
+use LWP;
+use URI::Escape;
 
 =head1 NAME
 
@@ -15,11 +17,11 @@
 
 =head1 VERSION
 
-Version 0.01
+Version 0.04
 
 =cut
 
-our $VERSION = '0.01';
+our $VERSION = '0.04';
 
 =head1 SYNOPSIS
 
@@ -33,7 +35,7 @@
 Connect to Hyper Estraier index using HTTP
 
  my $est = new WebPAC::Output::Estraier(
- 	url => 'http://localhost:1978/node/webpac2',
+ 	masterurl => 'http://localhost:1978/',
 	user => 'admin',
 	passwd => 'admin',
 	database => 'demo',
@@ -44,7 +46,7 @@
 
 =over 4
 
-=item url
+=item masterurl
 
 URI to C<estmaster> node
 
@@ -79,23 +81,43 @@
 
 	my $log = $self->_get_logger;
 
-	foreach my $p (qw/url user passwd/) {
+	#$log->debug("self: ", sub { Dumper($self) });
+
+	foreach my $p (qw/masterurl user passwd database/) {
 		$log->logdie("need $p") unless ($self->{$p});
 	}
 
-	$log->info("opening Hyper Estraier index $self->{'url'}");
+	my $url = $self->{masterurl} . '/node/' . $self->{database};
+	$self->{url} = $url;
+
+	$log->info("opening Hyper Estraier index $self->{url}");
+
+	my $nodes = $self->est_master( action => 'nodelist' );
+
+	$log->debug("nodes found: $nodes");
+
+	if ($nodes !~ m/^$self->{database}\t/sm) {
+		$log->info("creating index $url");
+		$self->est_master(
+			action => 'nodeadd',
+			name => $self->{database},
+			label => "WebPAC $self->{database}",
+		) || $log->logdie("can't create Hyper Estraier node $self->{database}");
+	}
 
-	$self->{'db'} = HyperEstraier::Node->new($self->{'url'});
-	$self->{'db'}->set_auth($self->{'user'}, $self->{'passwd'});
+	$self->{'db'} = HyperEstraier::Node->new($self->{url});
+	$self->{'db'}->set_auth($self->{'user'}, $self->{passwd});
 
 	my $encoding = $self->{'encoding'} || 'ISO-8859-2';
 	$log->info("using encoding $encoding");
 
-	my $iconv = new Text::Iconv('iso-8859-2', 'utf-8');
+	$self->{'iconv'} = new Text::Iconv($encoding, 'UTF-8') or
+		$log->logdie("can't create conversion from $encoding to UTF-8");
 
 	$self ? return $self : return undef;
 }
 
+
 =head2 add
 
 Adds one entry to database.
@@ -104,13 +126,12 @@
   	id => 42,
 	ds => $ds,
 	type => 'display',
-	url_prefix => 'database name',
 	text => 'optional text from which snippet is created',
   );
 
 This function will create  entries in index using following URI format:
 
-  C<file:///database%20name/000>
+  C<file:///type/database%20name/000>
 
 Each tag in C<data_structure> with specified C<type> will create one
 attribute and corresponding hidden text (used for search).
@@ -132,19 +153,19 @@
 	}
 
 	my $type = $args->{'type'};
-	my $mfn = $args->{'id'};
+	my $id = $args->{'id'};
 
-	my $uri = "file:///$type/$database/$mfn";
+	my $uri = "file:///$type/$database/$id";
 	$log->debug("creating $uri");
 
 	my $doc = HyperEstraier::Document->new;
-	$doc->add_attr('@uri', $uri);
+	$doc->add_attr('@uri', $self->{'iconv'}->convert($uri) );
 
 	$log->debug("ds = ", sub { Dumper($args->{'ds'}) } );
 
 	# filter all tags which have type defined
 	my @tags = grep {
-		defined( $args->{'ds'}->{$_}->{$type} )
+		ref($args->{'ds'}->{$_}) eq 'HASH' && defined( $args->{'ds'}->{$_}->{$type} )
 	} keys %{ $args->{'ds'} };
 
 	$log->debug("tags = ", join(",", @tags));
@@ -157,19 +178,90 @@
 
 		$log->logconfess("no values for $tag/$type") unless ($vals);
 
-		$doc->add_attr($tag, $vals);
-		$doc->add_hidden_text($vals);
+		$vals = $self->{'iconv'}->convert( $vals ) or
+			$log->logdie("can't convert '$vals' to UTF-8");
+
+		$doc->add_attr( $tag, $vals );
+		$doc->add_hidden_text( $vals );
 	}
 
 	my $text = $args->{'text'};
-	$doc->add_text( $text ) if ( $text );
+	if ( $text ) {
+		$text = $self->{'iconv'}->convert( $text ) or
+			$log->logdie("can't convert '$text' to UTF-8");
+		$doc->add_text( $text );
+	}
 
 	$log->debug("adding ", sub { $doc->dump_draft } );
-	$self->{'db'}->put_doc($doc) || $log->die("can't add document $uri to index");
+	$self->{'db'}->put_doc($doc) || $log->logdie("can't add document $uri to node " . $self->{url} . " status: " . $self->{db}->status());
 
 	return 1;
 }
 
+=head2 est_master
+
+Issue administrative commands to C<estmaster> process and receive response
+as array of lines
+
+  my $nodelist = $self->est_master( action => nodelist );
+
+=cut
+
+my $estmaster_actions = {
+	userdel => [ qw/name/ ],
+	nodelist => [],
+	nodeadd => [ qw/name label/ ],
+	nodedel => [ qw/name/ ],
+};
+
+sub est_ua {
+	my $self = shift;
+
+	return $self->{_master_ua} if ($self->{_master_ua});
+
+	$self->{_master_ua} = LWP::UserAgent->new( ) || sub {
+		my $log = $self->_get_logger;
+		$log->logdie("can't create LWP::UserAgent: $!");
+	};
+
+	$self->{_master_ua}->credentials('localhost:1978','Super User', $self->{user} => $self->{passwd});
+
+	return $self->{_master_ua};
+}
+
+sub est_master {
+	my $self = shift;
+	my $args = {@_};
+	my $log = $self->_get_logger;
+
+	$log->debug(Dumper($args));
+
+	my $action = $args->{action} || $log->logconfess("no action specified");
+
+	$log->logdie("action '$action' isn't supported") unless ($estmaster_actions->{$action});
+
+	my $url = $self->{masterurl} . '/master?action=' . $action;
+
+	foreach my $arg (@{ $estmaster_actions->{$action} }) {
+		$log->logdie("missing parametar $arg for action $action") unless ($args->{$arg});
+		$url .= '&' . $arg . '=' . uri_escape( $args->{$arg} );
+	}
+
+	$log->debug("calling $url");
+
+	my $res = $self->est_ua()->get($url);
+
+	if ($res->is_success) {
+		#$log->debug( $res->content );
+		return split(/\n/, $res->content) if wantarray;
+		return $res->content;
+	} else {
+		$log->warn("unable to call $url: " . $res->status_line);
+		return;
+	}
+
+}
+
 =head1 AUTHOR
 
 Dobrica Pavlinusic, C<< <dpavlin@rot13.org> >>