/[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 200 by dpavlin, Wed Nov 30 23:21:30 2005 UTC
# Line 8  use base qw/ Line 8  use base qw/
8  /;  /;
9  use Data::Dumper;  use Data::Dumper;
10  use WebPAC::DB;  use WebPAC::DB;
11  use WebPAC::Output::TT;  use WebPAC::Output::TT 0.02;
12  use WebPAC::Search::Estraier 0.02;  use WebPAC::Search::Estraier 0.02;
13  use File::Slurp;  use File::Slurp;
14    use Time::HiRes;
15    
16  =head1 NAME  =head1 NAME
17    
# Line 67  sub new { Line 68  sub new {
68    
69          $self->{est} = new WebPAC::Search::Estraier( %{ $est_cfg } );          $self->{est} = new WebPAC::Search::Estraier( %{ $est_cfg } );
70    
71          my $db_path = $c->config->{webpac}->{db_path};          # save config parametars in object
72          my $template_path = $c->config->{webpac}->{template_path};          foreach my $f (qw/db_path template_path hits_on_page webpac_encoding out_encoding/) {
73          $self->{template_path} = $template_path;                  $self->{$f} = $c->config->{hyperestraier}->{$f} ||
74                            $c->config->{webpac}->{$f};
75                    $log->debug("self->{$f} = " . $self->{$f});
76            }
77            my $db_path = $self->{db_path};
78            my $template_path = $self->{template_path};
79    
80          $log->debug("using db path '$db_path', template path '$template_path'");          $log->debug("using db path '$db_path', template path '$template_path'");
81    
# Line 98  sub new { Line 104  sub new {
104                  "'"                  "'"
105          );          );
106    
107    
108          return $self;          return $self;
109    
110  }  }
111    
 =head2 iconv_on_save  
112    
113    my $out = $m->iconv_on_save( $content );  =head2 search
114    
115  Convert data saved to disk in Webpac encoding.    my $m->search(
116            phrase => 'query phrase',
117            add_attr => \@add_attr
118            get_attr => [ '@uri' ],
119            max => 42,
120            template => 'result_template.tt',
121      );
122    
123    All fields are standard C<WebPAC::Search::Estraier> parametars except
124    C<template> which will (if specified) return results in HTML using
125    selected template.
126    
127  =cut  =cut
128    
129  sub iconv_on_save {  sub search {
130          my $self = shift;          my $self = shift;
131    
132          $self->{iconv_save} ||= new Text::Iconv(          my $args = {@_};
                 $self->config->{webpac}->{out_encoding},  
                 $self->config->{webpac}->{webpac_encoding},  
         );  
133    
134          $self->{iconv_save}->convert( @_ );          my $log = $self->{log};
 }  
135    
136            $log->debug("args: " . Dumper( $args ));
137    
138  =head2 search          my $query = $args->{phrase} || $log->warn("no query phrase") && return;
139    
140    my $m->search( 'query phrase', 'result_template.tt', \@add_attr );          $log->debug("search model query: '$query'");
141            if ($args->{add_attr}) {
142                    $log->debug(" + add_attr: " .
143                            join("','", @{ $args->{add_attr} })
144                    );
145            }
146    
147  =cut          my $template_filename = $args->{template} || $self->{template};
148    
149  sub search {          $args->{max} ||= $self->{'hits_on_page'};
150          my ( $self, $query, $template, $add_attr ) = @_;          if (! $args->{max}) {
151                    $args->{max} = 10;
152                    $log->warn("max not set when calling model. Using default of 10");
153            }
154    
155          my $log = $self->{log};          my $times;      # store some times for benchmarking
156    
157          $log->debug("search model query: '$query', add_attr: '" . join("','", @{$add_attr}) . "'");          my $t = time();
158    
159          my $template_filename = $template || $self->{template};          my @results = $self->{est}->search( %{ $args } );
160    
161          my @results = $self->{est}->search(          $times->{est} += time() - $t;
162                  phrase => $query,  
163                  get_attr => [ '@uri' ],          my $hits = $#results + 1;
                 max => $self->{est}->{hits_on_page} || 30,  
                 add_attr => $add_attr,  
         );  
164    
165          $log->debug("loading " . ($#results + 1) . " results");          $log->debug( sprintf("search took %.2fs and returned $hits hits.", $times->{est}) );
166    
167            # just return results?
168            return @results unless ($args->{'template'});
169    
170            #
171            # construct HTML results
172            #
173    
174          my @html_results;          my @html_results;
175    
# Line 154  sub search { Line 179  sub search {
179    
180                  #$log->debug("load_ds( $mfn )");                  #$log->debug("load_ds( $mfn )");
181    
182                    $t = time();
183    
184                  my $ds = $self->{db}->load_ds( $mfn ) || $log->error("can't load_ds( $mfn )") && next;                  my $ds = $self->{db}->load_ds( $mfn ) || $log->error("can't load_ds( $mfn )") && next;
185            
186                    $times->{db} += time() - $t;
187    
188                  #$log->debug( "ds = " . Dumper( \@html_results ) );                  #$log->debug( "ds = " . Dumper( \@html_results ) );
189    
190                    $t = time();
191    
192                  my $html = $self->{out}->apply(                  my $html = $self->{out}->apply(
193                          template => $template_filename,                          template => $template_filename,
194                          data => $ds,                          data => $ds,
195                  );                  );
196    
197                    $times->{out} += time() - $t;
198    
199                    $t = time();
200    
201                  $html = $self->{iconv}->convert( $html ) || $log->error("can't convert: $html");                  $html = $self->{iconv}->convert( $html ) || $log->error("can't convert: $html");
202    
203                    $times->{iconv} += time() - $t;
204    
205                  push @html_results, $html;                  push @html_results, $html;
206    
207          }          }
208    
209          #$log->debug( '@html_results = ' . Dumper( \@html_results ) );          #$log->debug( '@html_results = ' . Dumper( \@html_results ) );
210    
211            $log->debug( sprintf(
212                    "time spent: db = %.2f, out = %.2f, iconv = %.2f",
213                    $times->{db}, $times->{out}, $times->{iconv},
214            ) );
215    
216          return \@html_results;          return \@html_results;
217  }  }
218    
219    =head2 record
220    
221      my $html = $m->record(
222            mfn => 42,
223            template => 'foo.tt',
224      );
225    
226    This will load one record, convert it to html using C<template> and return
227    it.
228    
229    =cut
230    
231    sub record {
232            my $self = shift;
233    
234            my $args = {@_};
235            my $log = $self->{log};
236            $log->debug("args: " . Dumper( $args ));
237    
238            foreach my $f (qw/mfn template/) {
239                    $log->die("need $f") unless ($args->{$f});
240            }
241    
242            my $mfn = $args->{mfn};
243    
244            my $ds = $self->{db}->load_ds( $mfn ) || $log->error("can't load_ds( $mfn )") && next;
245    
246            my $html = $self->{out}->apply(
247                    template => $args->{template},
248                    data => $ds,
249            );
250    
251            $html = $self->{iconv}->convert( $html ) || $log->error("can't convert: $html");
252    
253            return $html;
254    }
255    
256  =head2 save_html  =head2 save_html
257    
258    $m->save_html( '/full/path/to/file', $content );    $m->save_html( '/full/path/to/file', $content );
259    
260  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
261  Webpac codepage, recode JavaScript Unicode entities (%u1234),  Webpac codepage, recode JavaScript Unicode entities (%u1234),
262  strip extra newlines at beginning and end, and save to  strip extra newlines at beginning and end, and save to
263  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 268  it over original file which should be at
268  sub save_html {  sub save_html {
269          my ($self, $path, $content) = @_;          my ($self, $path, $content) = @_;
270    
         $content = $self->iconv_on_save( $content ) || die "no content?";  
   
271          sub _conv_js {          sub _conv_js {
272                  my $t = shift || return;                  my $t = shift || return;
273                  return $self->{iconv}->convert(chr(hex($t)));                  return $self->{iconv}->convert(chr(hex($t)));
# Line 199  sub save_html { Line 276  sub save_html {
276          $content =~ s/^[\n\r]+//s;          $content =~ s/^[\n\r]+//s;
277          $content =~ s/[\n\r]+$/\n/s;          $content =~ s/[\n\r]+$/\n/s;
278    
279          write_file($path . '.new', $content) || die "can't save ${path}.new $!";          my ($from, $to) = (
280                    $self->{out_encoding},
281                    $self->{webpac_encoding},
282            );
283    
284            $self->{log}->debug("using iconv to convert from $from to $to encoding");
285    
286            my $iconv_on_save = new Text::Iconv($from, $to)
287                    || $self->{log}->fatal("can't create iconv for saving");
288    
289            $content = $iconv_on_save->convert( $content ) || die "no content?";
290    
291            write_file($path . '.new', {binmode => ':raw' }, $content) || die "can't save ${path}.new $!";
292          rename $path . '.new', $path || die "can't rename to $path: $!";          rename $path . '.new', $path || die "can't rename to $path: $!";
293  }  }
294    
# Line 218  sub load_html { Line 307  sub load_html {
307    
308          die "no path?" unless ($path);          die "no path?" unless ($path);
309    
310          my $content = read_file($path) || die "can't read $path: $!";          my $content = read_file($path, {binmode => ':raw' }) || die "can't read $path: $!";
311          #$content = $q->escapeHTML($iconv_utf8->convert($content));          #$content = $q->escapeHTML($iconv_utf8->convert($content));
312          $content = $self->{iconv}->convert($content);          $content = $self->{iconv}->convert($content);
313    
Legend:
Removed from v.143  
changed lines
  Added in v.200
  ViewVC Help
Powered by ViewVC 1.1.26