--- Webpacus/lib/Webpacus/Model/WebPAC.pm 2006/01/07 17:34:16 348 +++ Webpacus/lib/Webpacus/Model/WebPAC.pm 2006/02/19 22:40:40 405 @@ -6,13 +6,12 @@ use base qw/ Catalyst::Model /; -use Data::Dumper; use WebPAC::Store 0.08; -use WebPAC::Output::TT 0.06; -use WebPAC::Search::Estraier 0.05; +use Search::Estraier 0.04; use File::Slurp; -use Time::HiRes; +use Time::HiRes qw/time/; use Encode qw/encode decode from_to/; +use Template; =head1 NAME @@ -66,7 +65,7 @@ $est_cfg->{encoding} = $est_cfg->{catalyst_encoding} || $c->config->{catalyst_encoding} or $c->log->fatal("can't find catalyst_encoding"); - $log->debug("using config:" . Dumper($est_cfg) ); + $log->dumper($est_cfg, 'est_cfg'); if (! $est_cfg->{database}) { my $defaultnode = $est_cfg->{defaultnode} || $log->logdie("can't find defaultnode in estraier configuration"); @@ -74,10 +73,23 @@ $est_cfg->{database} = $defaultnode; } - $self->{est} = new WebPAC::Search::Estraier( %{ $est_cfg } ); + my $url = $est_cfg->{masterurl} . '/node/' . $est_cfg->{database}; + + $log->info("opening Hyper Estraier index $url as $est_cfg->{'user'}"); + + $self->{est_node} = Search::Estraier::Node->new( + url => $url, + user => $est_cfg->{user}, + passwd => $est_cfg->{passwd}, + ); + + $log->fatal("can't create Search::Estraier::Node $url") unless ($self->{est_node}); # save config parametars in object - foreach my $f (qw/db_path template_path hits_on_page webpac_encoding defaultdepth/) { + foreach my $f (qw/ + db_path template_path hits_on_page webpac_encoding defaultdepth + masterurl defaultnode + /) { $self->{$f} = $c->config->{hyperestraier}->{$f} || $c->config->{webpac}->{$f}; $log->debug("self->{$f} = " . $self->{$f}); @@ -93,11 +105,6 @@ database => $est_cfg->{database}, ); - $self->{out} = new WebPAC::Output::TT( - include_path => $template_path, - filters => { foo => sub { shift } }, - ); - # default template from config.yaml $self->{template} ||= $c->config->{webpac}->{template}; @@ -106,12 +113,53 @@ "'" ); - $self->{databases} = $c->config->{databases} || $log->error("can't find databases in config"); + $self->{databases} = $c->config->{databases} || $log->fatal("can't find databases in config"); + + # create Template toolkit instance + $self->{'tt'} = Template->new( + INCLUDE_PATH => $template_path, + FILTERS => { + dump_html => sub { + return unless (@_); + my $out; + my $i = 1; + foreach my $v (@_) { + $out .= qq{
} . + Data::HTMLDumper->Dump([ $v ],[ "v$i" ]) . + qq{
}; + $i++; + } + $out =~ s!/]*>!!gis if ($out); + return $out; + } + }, + EVAL_PERL => 1, + ); return $self; } +=head2 setup_site + + $self->setup_site('site_name'); + +Change node URL and database name according to site name (if available) or fallback +to C from configuration. + +=cut + +sub setup_site { + my $self = shift; + + my $site = shift || $self->{defaultnode}; + + $self->{log}->fatal("setup_site can't find site or defaultnode") unless ($site); + + my $url = $self->{masterurl} . '/node/' . $site; + $self->{est_node}->set_url( $url ); + $self->{log}->debug("setup_site $site using $url"); +} =head2 search @@ -133,21 +181,16 @@ sub search { my $self = shift; + my $search_start_t = time(); + my $args = {@_}; my $log = $self->{log}; - $log->debug("args: " . Dumper( $args )); + $log->dumper($args, 'args'); my $query = $args->{phrase} || $log->warn("no query phrase") && return; - $log->debug("search model query: '$query'"); - if ($args->{add_attr}) { - $log->debug(" + add_attr: " . - join("','", @{ $args->{add_attr} }) - ); - } - my $template_filename = $args->{template} || $self->{template}; $args->{max} ||= $self->{'hits_for_pager'}; @@ -166,77 +209,165 @@ $args->{depth} = $default; $log->warn("using default search depth $default"); } + $args->{depth} ||= 0; - my @results = $self->{est}->search( %{ $args } ); + $log->debug("searching for maximum $args->{max} results using depth $args->{depth} phrase: ", $query || '[none]'); - $times->{est} += time() - $t; + # + # construct condition for Hyper Estraier + # + 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( $_ ); + $log->debug(" + $_"); + } @{ $args->{add_attr} }; + }; + + $cond->set_phrase( $query ) if ($query); + $cond->set_options( $args->{options} ) if ($args->{options}); + $cond->set_order( $args->{order} ) if ($args->{order}); + + my $max = $args->{max} || 7; + my $page = $args->{page} || 1; + if ($page < 1) { + $log->warn("page number $page < 1"); + $page = 1; + } - my $hits = $#results + 1; + $cond->set_max( $page * $max ); - $log->debug( sprintf("search took %.2fs and returned $hits hits.", $times->{est}) ); + my $result = $self->{est_node}->search($cond, $args->{depth}); + my $hits = $result->doc_num; - # just return results? - return @results unless ($args->{'template'}); + $times->{est} += time() - $t; + + $log->debug( sprintf("search took %.6fs and returned $hits hits.", $times->{est}) ); + + $self->{hints} = $result->{hints}; + $log->dumper($self->{hints}, 'hints' ); # - # construct HTML results + # fetch results # - my @html_results; + my @results; - for my $i ( 0 .. $#results ) { + for my $i ( (($page - 1) * $max) .. ( $hits - 1 ) ) { - my ($database, $prefix, $id); - if ( $results[$i]->{'@uri'} =~ m!/([^/]+)/([^/]+)/(\d+)$!) { - ($database, $prefix,$id) = ($1,$2,$3); - } else { - $log->warn("can't decode database/prefix/id from " . $results[$i]->{'@uri'}); + $t = time(); + + #$log->debug("get_doc($i)"); + my $doc = $result->get_doc( $i ); + if (! $doc) { + $log->warn("can't find result $i"); next; } - #$log->debug("load_ds( id => $id, prefix => '$prefix' )"); - - $t = time(); + my $hash; - my $ds = $self->{db}->load_ds( database => $database, prefix => $prefix, id => $id ); - if (! $ds) { - $log->error("can't load_ds( ${database}/${prefix}/${id} )"); - next; + foreach my $attr (@{ $args->{get_attr} }) { + my $val = $doc->attr( $attr ); + #$log->debug("attr $attr = ", $val || 'undef'); + $hash->{$attr} = $val if (defined($val)); } - $times->{db} += time() - $t; + $times->{hash} += time() - $t; - #$log->debug( "ds = " . Dumper( \@html_results ) ); + next unless ($hash); - $t = time(); + if (! $args->{'template'}) { + push @results, $hash; + } else { + my ($database, $prefix, $id); - my $html = $self->{out}->apply( - template => $template_filename, - data => $ds, - record_uri => "${database}/${prefix}/${id}", - config => $self->{databases}->{$database}, - ); + if ( $hash->{'@uri'} =~ m!/([^/]+)/([^/]+)/(\d+)$!) { + ($database, $prefix,$id) = ($1,$2,$3); + } else { + $log->warn("can't decode database/prefix/id from " . $hash->{'@uri'}); + next; + } - $times->{out} += time() - $t; + #$log->debug("load_ds( id => $id, prefix => '$prefix' )"); - $t = time(); + $t = time(); - $html = decode($self->{webpac_encoding}, $html); + my $ds = $self->{db}->load_ds( database => $database, prefix => $prefix, id => $id ); + if (! $ds) { + $log->error("can't load_ds( ${database}/${prefix}/${id} )"); + next; + } - push @html_results, $html; + $times->{db} += time() - $t; - } + $t = time(); + + my $html = $self->apply( + template => $template_filename, + data => $ds, + record_uri => "${database}/${prefix}/${id}", + config => $self->{databases}->{$database}, + ); + + $times->{apply} += time() - $t; - #$log->debug( '@html_results = ' . Dumper( \@html_results ) ); + $t = time(); + + $html = decode($self->{webpac_encoding}, $html); + + $times->{decode} += time() - $t; + + push @results, $html; + } + + } $log->debug( sprintf( - "time spent: db = %.2f, out = %.2f", - $times->{db}, $times->{out}, + "duration breakdown: estraier %.6fs, hash %.6fs, store %.6fs, apply %.6fs, decode %.06f, total: %.6fs", + $times->{est}, $times->{hash}, $times->{db}, $times->{apply}, $times->{decode}, time() - $search_start_t, ) ); - return \@html_results; + return \@results; +} + +=head2 hints + + my $hints = $m->hints; + +Return various useful hints about result + +=cut + +sub hints { + my $self = shift; + + unless ($self->{hints}) { + $self->{log}->fatal("no hints found!"); + return; + } + + my $hints; + + while (my ($key,$val) = each %{ $self->{hints} }) { + + if ($key =~ m/^(?:HITS*|TIME|DOCNUM|WORDNUM)$/) { + $hints->{ lc($key) } = $val; + } elsif ($key =~ m/^HINT#/) { + my ($word,$count) = split(/\t/,$val,2); + $hints->{words}->{$word} = $count; + } elsif ($key =~ m/^LINK#/) { + my ($url,undef,undef,undef,undef,undef,$results) = split(/\t/,$val,7); + if ($url =~ m#/node/(.+)$#) { + $hints->{node}->{$1} = $results; + } + } + } + + return $hints; } + =head2 record my $html = $m->record( @@ -254,7 +385,7 @@ my $args = {@_}; my $log = $self->{log}; - $log->debug("args: " . Dumper( $args )); + $log->dumper( $args, 'args' ); foreach my $f (qw/record_uri template/) { $log->fatal("need $f") unless ($args->{$f}); @@ -275,7 +406,7 @@ return; } - my $html = $self->{out}->apply( + my $html = $self->apply( template => $args->{template}, data => $ds, record_uri => $args->{record_uri}, @@ -288,6 +419,68 @@ } +=head2 list_nodes + + my @nodes = $m->list_nodes( 'site' ); + +Return all databases which have records for selected site. Returned array of +hashes has elements C and C