/[webpac2]/Webpacus/lib/Webpacus/Model/WebPAC.pm
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /Webpacus/lib/Webpacus/Model/WebPAC.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 143 by dpavlin, Fri Nov 25 01:24:31 2005 UTC revision 224 by dpavlin, Mon Dec 5 19:15:11 2005 UTC
# Line 7  use base qw/ Line 7  use base qw/
7          Catalyst::Model          Catalyst::Model
8  /;  /;
9  use Data::Dumper;  use Data::Dumper;
10  use WebPAC::DB;  use WebPAC::Store 0.03;
11  use WebPAC::Output::TT;  use WebPAC::Output::TT 0.02;
12  use WebPAC::Search::Estraier 0.02;  use WebPAC::Search::Estraier 0.05;
13  use File::Slurp;  use File::Slurp;
14    use Time::HiRes;
15    
16  =head1 NAME  =head1 NAME
17    
# Line 33  Configuration for hyperestraier in C<con Line 34  Configuration for hyperestraier in C<con
34    
35   # configuration for hyper estraier full text search engine   # configuration for hyper estraier full text search engine
36   hyperestraier:   hyperestraier:
37    url: 'http://localhost:1978/node/webpac2'    masterurl: 'http://localhost:1978/node/webpac2'
38      defaultnode: 'webpac2'
39      defaultdepth: 1
40    user: 'admin'    user: 'admin'
41    passwd: 'admin'    passwd: 'admin'
42    hits_on_page: 100    hits_on_page: 100
# Line 65  sub new { Line 68  sub new {
68    
69          $log->debug("using config:" . Dumper($est_cfg) );          $log->debug("using config:" . Dumper($est_cfg) );
70    
71            if (! $est_cfg->{database}) {
72                    my $defaultnode = $est_cfg->{defaultnode} || $log->logdie("can't find defaultnode in estraier configuration");
73                    $log->info("using default node $defaultnode");
74                    $est_cfg->{database} = $defaultnode;
75            }
76    
77          $self->{est} = new WebPAC::Search::Estraier( %{ $est_cfg } );          $self->{est} = new WebPAC::Search::Estraier( %{ $est_cfg } );
78    
79          my $db_path = $c->config->{webpac}->{db_path};          # save config parametars in object
80          my $template_path = $c->config->{webpac}->{template_path};          foreach my $f (qw/db_path template_path hits_on_page webpac_encoding out_encoding defaultdepth/) {
81          $self->{template_path} = $template_path;                  $self->{$f} = $c->config->{hyperestraier}->{$f} ||
82                            $c->config->{webpac}->{$f};
83                    $log->debug("self->{$f} = " . $self->{$f});
84            }
85            my $db_path = $self->{db_path};
86            my $template_path = $self->{template_path};
87    
88          $log->debug("using db path '$db_path', template path '$template_path'");          $log->debug("using db path '$db_path', template path '$template_path'");
89    
90          $self->{db} = new WebPAC::DB(          $self->{db} = new WebPAC::Store(
91                  path => $db_path,                  path => $db_path,
92                  read_only => 1,                  read_only => 1,
93                    database => $est_cfg->{database},
94          );          );
95    
96          $self->{out} = new WebPAC::Output::TT(          $self->{out} = new WebPAC::Output::TT(
# Line 98  sub new { Line 113  sub new {
113                  "'"                  "'"
114          );          );
115    
116    
117          return $self;          return $self;
118    
119  }  }
120    
 =head2 iconv_on_save  
121    
122    my $out = $m->iconv_on_save( $content );  =head2 search
123    
124  Convert data saved to disk in Webpac encoding.    my $m->search(
125            phrase => 'query phrase',
126            add_attr => \@add_attr
127            get_attr => [ '@uri' ],
128            max => 42,
129            template => 'result_template.tt',
130            depth => 1,
131      );
132    
133    All fields are standard C<WebPAC::Search::Estraier> parametars except
134    C<template> which will (if specified) return results in HTML using
135    selected template.
136    
137  =cut  =cut
138    
139  sub iconv_on_save {  sub search {
140          my $self = shift;          my $self = shift;
141    
142          $self->{iconv_save} ||= new Text::Iconv(          my $args = {@_};
                 $self->config->{webpac}->{out_encoding},  
                 $self->config->{webpac}->{webpac_encoding},  
         );  
143    
144          $self->{iconv_save}->convert( @_ );          my $log = $self->{log};
 }  
145    
146            $log->debug("args: " . Dumper( $args ));
147    
148  =head2 search          my $query = $args->{phrase} || $log->warn("no query phrase") && return;
149    
150    my $m->search( 'query phrase', 'result_template.tt', \@add_attr );          $log->debug("search model query: '$query'");
151            if ($args->{add_attr}) {
152                    $log->debug(" + add_attr: " .
153                            join("','", @{ $args->{add_attr} })
154                    );
155            }
156    
157  =cut          my $template_filename = $args->{template} || $self->{template};
158    
159  sub search {          $args->{max} ||= $self->{'hits_on_page'};
160          my ( $self, $query, $template, $add_attr ) = @_;          if (! $args->{max}) {
161                    $args->{max} = 10;
162                    $log->warn("max not set when calling model. Using default of 10");
163            }
164    
165          my $log = $self->{log};          my $times;      # store some times for benchmarking
166    
167          $log->debug("search model query: '$query', add_attr: '" . join("','", @{$add_attr}) . "'");          my $t = time();
168    
169          my $template_filename = $template || $self->{template};          # transfer depth of search
170            if (! $args->{depth}) {
171                    my $default = $self->{defaultdepth} || $log->logdie("can't find defaultdepth in estraier configuration");
172                    $args->{depth} = $default;
173                    $log->warn("using default search depth $default");
174            }
175    
176          my @results = $self->{est}->search(          my @results = $self->{est}->search( %{ $args } );
177                  phrase => $query,  
178                  get_attr => [ '@uri' ],          $times->{est} += time() - $t;
179                  max => $self->{est}->{hits_on_page} || 30,  
180                  add_attr => $add_attr,          my $hits = $#results + 1;
181          );  
182            $log->debug( sprintf("search took %.2fs and returned $hits hits.", $times->{est}) );
183    
184          $log->debug("loading " . ($#results + 1) . " results");          # just return results?
185            return @results unless ($args->{'template'});
186    
187            #
188            # construct HTML results
189            #
190    
191          my @html_results;          my @html_results;
192    
193          for my $i ( 0 .. $#results ) {          for my $i ( 0 .. $#results ) {
194    
195                  my $mfn = $1 if ( $results[$i]->{'@uri'} =~ m#/(\d+)$#);                  my ($id, $prefix);
196                    if ( $results[$i]->{'@uri'} =~ m!/([^/]+)#(\d+)$!) {
197                            ($prefix,$id) = ($1,$2);
198                    } else {
199                            $log->warn("can't decode prefix#id from " .  $results[$i]->{'@uri'});
200                            next;
201                    }
202    
203                    #$log->debug("load_ds( id => $id, prefix => '$prefix' )");
204    
205                    $t = time();
206    
207                  #$log->debug("load_ds( $mfn )");                  my $ds = $self->{db}->load_ds( id => $id, prefix => $prefix ) || $log->error("can't load_ds( id => $id, prefix => '$prefix' )") && next;
208    
209                    $times->{db} += time() - $t;
210    
                 my $ds = $self->{db}->load_ds( $mfn ) || $log->error("can't load_ds( $mfn )") && next;  
           
211                  #$log->debug( "ds = " . Dumper( \@html_results ) );                  #$log->debug( "ds = " . Dumper( \@html_results ) );
212    
213                    $t = time();
214    
215                  my $html = $self->{out}->apply(                  my $html = $self->{out}->apply(
216                          template => $template_filename,                          template => $template_filename,
217                          data => $ds,                          data => $ds,
218                  );                  );
219    
220                    $times->{out} += time() - $t;
221    
222                    $t = time();
223    
224                  $html = $self->{iconv}->convert( $html ) || $log->error("can't convert: $html");                  $html = $self->{iconv}->convert( $html ) || $log->error("can't convert: $html");
225    
226                    $times->{iconv} += time() - $t;
227    
228                  push @html_results, $html;                  push @html_results, $html;
229    
230          }          }
231    
232          #$log->debug( '@html_results = ' . Dumper( \@html_results ) );          #$log->debug( '@html_results = ' . Dumper( \@html_results ) );
233    
234            $log->debug( sprintf(
235                    "time spent: db = %.2f, out = %.2f, iconv = %.2f",
236                    $times->{db}, $times->{out}, $times->{iconv},
237            ) );
238    
239          return \@html_results;          return \@html_results;
240  }  }
241    
242    =head2 record
243    
244      my $html = $m->record(
245            mfn => 42,
246            template => 'foo.tt',
247      );
248    
249    This will load one record, convert it to html using C<template> and return
250    it.
251    
252    =cut
253    
254    sub record {
255            my $self = shift;
256    
257            my $args = {@_};
258            my $log = $self->{log};
259            $log->debug("args: " . Dumper( $args ));
260    
261            foreach my $f (qw/mfn template prefix/) {
262                    $log->die("need $f") unless ($args->{$f});
263            }
264    
265            my $mfn = $args->{mfn};
266    
267            my $ds = $self->{db}->load_ds( id => $mfn, prefix => 'FIXME' ) || $log->error("can't load_ds( $mfn )") && next;
268    
269            my $html = $self->{out}->apply(
270                    template => $args->{template},
271                    data => $ds,
272            );
273    
274            $html = $self->{iconv}->convert( $html ) || $log->error("can't convert: $html");
275    
276            return $html;
277    }
278    
279  =head2 save_html  =head2 save_html
280    
281    $m->save_html( '/full/path/to/file', $content );    $m->save_html( '/full/path/to/file', $content );
282    
283  It will use C<iconv_on_save> to convert content encoding back to  It will use C<Text::Iconv> to convert content encoding back to
284  Webpac codepage, recode JavaScript Unicode entities (%u1234),  Webpac codepage, recode JavaScript Unicode entities (%u1234),
285  strip extra newlines at beginning and end, and save to  strip extra newlines at beginning and end, and save to
286  C</full/path/to/file.new> and if that succeeds, just rename  C</full/path/to/file.new> and if that succeeds, just rename
# Line 189  it over original file which should be at Line 291  it over original file which should be at
291  sub save_html {  sub save_html {
292          my ($self, $path, $content) = @_;          my ($self, $path, $content) = @_;
293    
         $content = $self->iconv_on_save( $content ) || die "no content?";  
   
294          sub _conv_js {          sub _conv_js {
295                  my $t = shift || return;                  my $t = shift || return;
296                  return $self->{iconv}->convert(chr(hex($t)));                  return $self->{iconv}->convert(chr(hex($t)));
# Line 199  sub save_html { Line 299  sub save_html {
299          $content =~ s/^[\n\r]+//s;          $content =~ s/^[\n\r]+//s;
300          $content =~ s/[\n\r]+$/\n/s;          $content =~ s/[\n\r]+$/\n/s;
301    
302          write_file($path . '.new', $content) || die "can't save ${path}.new $!";          my ($from, $to) = (
303                    $self->{out_encoding},
304                    $self->{webpac_encoding},
305            );
306    
307            $self->{log}->debug("using iconv to convert from $from to $to encoding");
308    
309            my $iconv_on_save = new Text::Iconv($from, $to)
310                    || $self->{log}->fatal("can't create iconv for saving");
311    
312            $content = $iconv_on_save->convert( $content ) || die "no content?";
313    
314            write_file($path . '.new', {binmode => ':raw' }, $content) || die "can't save ${path}.new $!";
315          rename $path . '.new', $path || die "can't rename to $path: $!";          rename $path . '.new', $path || die "can't rename to $path: $!";
316  }  }
317    
# Line 218  sub load_html { Line 330  sub load_html {
330    
331          die "no path?" unless ($path);          die "no path?" unless ($path);
332    
333          my $content = read_file($path) || die "can't read $path: $!";          my $content = read_file($path, {binmode => ':raw' }) || die "can't read $path: $!";
334          #$content = $q->escapeHTML($iconv_utf8->convert($content));          #$content = $q->escapeHTML($iconv_utf8->convert($content));
335          $content = $self->{iconv}->convert($content);          $content = $self->{iconv}->convert($content);
336    
Legend:
Removed from v.143  
changed lines
  Added in v.224
  ViewVC Help
Powered by ViewVC 1.1.26