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

This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!

Diff of /trunk/lib/WebPAC/Search/Estraier.pm

Parent Directory | Revision Log | View Patch Patch

-revision 152 by dpavlin,
Sat Nov 26 01:38:28 2005 UTC
+revision 535 by dpavlin,
Mon Jun 26 16:39:42 2006 UTC
 Line 3 
 package WebPAC::Search::Estraier;
  use warnings;
  use strict;
- use HyperEstraier;
+ use Search::Estraier;
- use Text::Iconv;
+ use Encode qw/from_to/;
  use Data::Dumper;
  =head1 NAME
 Line 13 
 WebPAC::Search::Estraier - search Hyper
  =head1 VERSION
- Version 0.02
+ Version 0.07
  =cut
- our $VERSION = '0.02';
+ our $VERSION = '0.07';
  =head1 SYNOPSIS
 Line 31 
 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',
-Line 42 
 Options are:
+Line 43 
 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
-Line 76 
 sub new {
+Line 81 
 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});
          }
-         $log->info("opening Hyper Estraier index $self->{'url'} as $self->{'user'}");
+         my $url = $self->{masterurl} . '/node/' . $self->{database};
+         $self->{url} = $url;
-         $self->{'db'} = HyperEstraier::Node->new($self->{'url'});
+         $log->info("opening Hyper Estraier index $self->{'url'} as $self->{'user'}");
-         $self->{'db'}->set_auth($self->{'user'}, $self->{'passwd'});
-         my $encoding = $self->{'encoding'} || 'ISO-8859-2';
+         $self->{db} = Search::Estraier::Node->new;
-         $log->info("using encoding $encoding");
+         $self->{db}->set_url($self->{'url'});
+         $self->{db}->set_auth($self->{'user'}, $self->{'passwd'});
-         $self->{'iconv'} = new Text::Iconv('UTF-8', $encoding) or
+         $self->{'encoding'} ||= 'ISO-8859-2';
-                 $log->die("can't create conversion from UTF-8 to $encoding");
+         $log->info("using encoding ",$self->{encoding});
          $self ? return $self : return undef;
  }
-Line 109 
 Locate items in index
+Line 115 
 Locate items in index
          order => 'NUMD',
          max => 100,
          options => $HyperEstraier::Condition::SURE,
+         page => 42,
+         depth => 0,
    );
  Options are close match to Hyper Estraier API, except C<get_attr> which defines
-Line 116 
 attributes which will be returned in has
+Line 124 
 attributes which will be returned in has
  Results are returned as hash array with keys named by attributes
+ Pages are numbered C< 1 ... hits/max >.
  =cut
  sub search {
-Line 136 
 sub search {
+Line 146 
 sub search {
          $log->debug("args: " . Dumper( $args ));
-         my $cond = HyperEstraier::Condition->new();
+         my $cond = Search::Estraier::Condition->new();
          if ( ref($args->{add_attr}) eq 'ARRAY' ) {
                  $log->debug("adding search attributes: " . join(", ", @{ $args->{add_attr} }) );
                  map {
-                         $cond->add_attr( $self->{iconv}->convert( $_ ) );
+                         $cond->add_attr( $self->convert( $_ ) );
                          $log->debug(" + $_");
                  } @{ $args->{add_attr} };
          };
-         $cond->set_phrase( $self->{iconv}->convert($q) ) if ($q);
+         $cond->set_phrase( $self->convert($q) ) if ($q);
-         $cond->set_max( $args->{max} ) if ($args->{max});
          $cond->set_options( $args->{options} ) if ($args->{options});
          $cond->set_order( $args->{order} ) if ($args->{order});
-         my $result = $self->{db}->search($cond, 0) ||
+         my $max = $args->{max} || 7;
-                 $log->die("can't search for ", sub { Dumper( $args ) });
+         my $page = $args->{page} || 1;
+         if ($page < 1) {
+                 $log->warn("page number $page < 1");
+                 $page = 1;
+         }
+         $cond->set_max( $page * $max );
+         my $result = $self->{db}->search($cond, ( $args->{depth} || 0 )) ||
+                 $log->logdie("can't search for ", sub { Dumper( $args ) });
          my $hits = $result->doc_num;
          $log->debug("found $hits hits for '$q'");
          my @results;
-         for my $i ( 0 .. ( $hits - 1 ) ) {
+         for my $i ( (($page - 1) * $max) .. ( $hits - 1 ) ) {
                  #$log->debug("get_doc($i)");
                  my $doc = $result->get_doc( $i );
-Line 172 
 sub search {
+Line 190 
 sub search {
                  foreach my $attr (@{ $args->{get_attr} }) {
                          my $val = $doc->attr( $attr );
                          #$log->debug("attr $attr = ", $val || 'undef');
-                         $hash->{$attr} = $self->{iconv}->convert( $val ) if (defined($val));
+                         $hash->{$attr} = $self->convert( $val ) if (defined($val));
                  }
                  if ($hash) {
-Line 214 
 sub confess {
+Line 232 
 sub confess {
          }
  }
+ =head2 convert
+ convert internal encoding to UTF-8
+   my $utf8 = $self->convert( $text );
+ =cut
+ sub convert {
+         my $self = shift;
+         my $text = shift || return;
+         from_to($text, $self->{encoding}, 'UTF-8');
+         return $text;
+ }
  =head2 _get_logger
  For compatibility with same method from L<WebPAC::Common>, but without

 Legend:



Removed from v.152
 


changed lines


 
Added in v.535
 Legend:



Removed from v.152
 


changed lines


 
Added in v.535
-Removed from v.152
+Added in v.535

	ViewVC Help
Powered by ViewVC 1.1.26