--- Webpacus/lib/Webpacus/Model/WebPAC.pm 2005/11/22 12:57:09 92 +++ Webpacus/lib/Webpacus/Model/WebPAC.pm 2006/01/22 02:52:24 382 @@ -3,8 +3,15 @@ use strict; use warnings; use lib '/data/webpac2/lib'; -use base qw/Catalyst::Model/; -use WebPAC::Search::Estraier; +use base qw/ + Catalyst::Model +/; +use WebPAC::Store 0.08; +use Search::Estraier 0.04; +use File::Slurp; +use Time::HiRes qw/time/; +use Encode qw/encode decode from_to/; +use Template; use Data::Dumper; =head1 NAME @@ -28,9 +35,20 @@ # configuration for hyper estraier full text search engine hyperestraier: - url: 'http://localhost:1978/node/webpac2' - user: 'admin' - passwd: 'admin' + masterurl: 'http://localhost:1978/node/webpac2' + defaultnode: 'webpac2' + defaultdepth: 1 + user: 'admin' + passwd: 'admin' + hits_on_page: 100 + hits_for_pager: 1000 + + webpac: + db_path: '/data/webpac2/db' + template_path: '/data/webpac2/conf/output/tt' + template: 'html_ffzg_results_short.tt' + # encoding comming from webpac + webpac_encoding: 'iso-8859-2' =cut @@ -41,31 +59,616 @@ $self->config($config); my $log = $c->log; + $self->{log} = $log; -# if (! $c->stash->{est}) { + my $est_cfg = $c->config->{hyperestraier}; + $est_cfg->{'log'} = $log; - my $est_cfg = $c->config->{hyperestraier}; - $est_cfg->{'log'} = $log; + $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->debug("using config:" . Dumper($est_cfg) ); -# $c->stash->{est} = new WebPAC::Search::Estraier( %{ $est_cfg } ); -# } + if (! $est_cfg->{database}) { + my $defaultnode = $est_cfg->{defaultnode} || $log->logdie("can't find defaultnode in estraier configuration"); + $log->info("using default node $defaultnode"); + $est_cfg->{database} = $defaultnode; + } + + 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/) { + $self->{$f} = $c->config->{hyperestraier}->{$f} || + $c->config->{webpac}->{$f}; + $log->debug("self->{$f} = " . $self->{$f}); + } + my $db_path = $self->{db_path}; + my $template_path = $self->{template_path}; + + $log->debug("using db path '$db_path', template path '$template_path'"); + + $self->{db} = new WebPAC::Store( + path => $db_path, + read_only => 1, + database => $est_cfg->{database}, + ); + + # default template from config.yaml + $self->{template} ||= $c->config->{webpac}->{template}; + + $log->debug("converting encoding from webpac_encoding '" . + $c->config->{webpac}->{webpac_encoding} . + "'" + ); + + $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, + ); -# $log->debug("param: " . Dumper($c->req->params)); + return $self; -# $c->stash->{est}->search( -# query => $c->req->params->{Title}, -# max => 100, -# ); +} - return $self; +=head2 search + + my $m->search( + phrase => 'query phrase', + add_attr => \@add_attr + get_attr => [ '@uri' ], + max => 42, + template => 'result_template.tt', + depth => 1, + ); + +All fields are standard C parametars except +C