--- trunk/lib/WebPAC/Output/Estraier.pm 2005/11/22 08:27:53 85 +++ trunk/lib/WebPAC/Output/Estraier.pm 2007/09/03 15:26:46 887 @@ -5,9 +5,12 @@ use base qw/WebPAC::Common/; -use HyperEstraier; -use Text::Iconv; -use Data::Dumper; +use Search::Estraier 0.06; +use Encode qw/from_to/; +use Data::Dump qw/dump/; +use LWP; +use URI::Escape; +use List::Util qw/first/; =head1 NAME @@ -15,11 +18,11 @@ =head1 VERSION -Version 0.01 +Version 0.12 =cut -our $VERSION = '0.01'; +our $VERSION = '0.12'; =head1 SYNOPSIS @@ -33,18 +36,20 @@ 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', + label => 'node label', encoding => 'iso-8859-2', + clean => 1, ); Options are: =over 4 -=item url +=item masterurl URI to C node @@ -60,6 +65,10 @@ name of database from which data comes +=item label + +label for node (optional) + =item encoding character encoding of C if it's differenet than C @@ -74,25 +83,41 @@ sub new { my $class = shift; - my $self = {@_}; - bless($self, $class); + my $self = {@_}; + bless($self, $class); my $log = $self->_get_logger; - foreach my $p (qw/url user passwd/) { + #$log->debug("self: ", sub { dump($self) }); + + foreach my $p (qw/masterurl user passwd database/) { $log->logdie("need $p") unless ($self->{$p}); } - $log->info("opening Hyper Estraier index $self->{'url'}"); + $self->{encoding} ||= 'ISO-8859-2'; - $self->{'db'} = HyperEstraier::Node->new($self->{'url'}); - $self->{'db'}->set_auth($self->{'user'}, $self->{'passwd'}); + my $url = $self->{masterurl} . '/node/' . $self->{database}; + $self->{url} = $url; - my $encoding = $self->{'encoding'} || 'ISO-8859-2'; - $log->info("using encoding $encoding"); + $self->{label} ||= "WebPAC $self->{database}"; - $self->{'iconv'} = new Text::Iconv($encoding, 'UTF-8') or - $log->logdie("can't create conversion from $encoding to UTF-8"); + $self->{db} = Search::Estraier::Node->new( + url => $url, + user => $self->{user}, + passwd => $self->{passwd}, + debug => $self->{debug}, + create => 1, + label => $self->convert( $self->{label} ), + ); + + $log->info("using ", $self->{clean} ? "new " : "", "index $self->{url} '$self->{label}' with encoding $self->{encoding}"); + + if ($self->{clean}) { + $log->debug("clean $self->{database}"); + $self->master( action => 'nodeclr', name => $self->{database} ); + } else { + $log->debug("opening index $self->{url}"); + } $self ? return $self : return undef; } @@ -106,13 +131,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 + C Each tag in C with specified C will create one attribute and corresponding hidden text (used for search). @@ -122,7 +146,7 @@ sub add { my $self = shift; - my $args = {@_}; + my $args = {@_}; my $log = $self->_get_logger; @@ -134,19 +158,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', $self->{'iconv'}->convert($uri) ); + my $doc = Search::Estraier::Document->new; + $doc->add_attr('@uri', $self->convert($uri) ); - $log->debug("ds = ", sub { Dumper($args->{'ds'}) } ); + $log->debug("ds = ", sub { dump($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,9 +181,9 @@ my $vals = join(" ", @{ $args->{'ds'}->{$tag}->{$type} }); - $log->logconfess("no values for $tag/$type") unless ($vals); + next if (! $vals); - $vals = $self->{'iconv'}->convert( $vals ) or + $vals = $self->convert( $vals ) or $log->logdie("can't convert '$vals' to UTF-8"); $doc->add_attr( $tag, $vals ); @@ -168,17 +192,93 @@ my $text = $args->{'text'}; if ( $text ) { - $text = $self->{'iconv'}->convert( $text ) or + $text = $self->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->logdie("can't add document $uri to index"); + $self->{'db'}->put_doc($doc) || $log->warn("can't add document $uri with draft " . $doc->dump_draft . " to node " . $self->{url} . " status: " . $self->{db}->status()); return 1; } +=head2 add_link + + $est->add_link( + from => 'ps', + to => 'webpac2', + credit => 10000, + ); + +=cut + +sub add_link { + my $self = shift; + + my $args = {@_}; + my $log = $self->_get_logger; + + foreach my $p (qw/from to credit/) { + $log->logdie("need $p") unless ($args->{$p}); + } + + my $node = first { $_->{name} eq $args->{to} } $self->master( action => 'nodelist' ); + + if (! $node) { + $log->warn("can't find node $args->{to}, skipping link creaton"); + return; + } + + my $label = $node->{label}; + + if (! $label) { + $log->warn("can't find label for $args->{to}, skipping link creaton"); + return; + } + + $log->debug("using label $label for $args->{to}"); + + return $self->{db}->set_link( + $self->{masterurl} . '/node/' . $args->{to}, + $label, + $args->{credit}, + ); +} + + +=head2 master + +Issue administrative commands to C process. See documentation for +C in L::Node. + + $self->master( + action => 'nodeclr', + name => 'foobar', + ); + +=cut + +sub master { + my $self = shift; + $self->{db}->master( @_ ); +} + + +=head2 convert + + my $utf8_string = $self->convert('string in codepage'); + +=cut + +sub convert { + my $self = shift; + + my $text = shift || return; + from_to($text, $self->{encoding}, 'UTF-8'); + return $text; +} + =head1 AUTHOR Dobrica Pavlinusic, C<< >>