/[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 271 by dpavlin, Sat Dec 17 03:19:58 2005 UTC revision 322 by dpavlin, Sun Dec 25 23:31:59 2005 UTC
# Line 8  use base qw/ Line 8  use base qw/
8  /;  /;
9  use Data::Dumper;  use Data::Dumper;
10  use WebPAC::Store 0.08;  use WebPAC::Store 0.08;
11  use WebPAC::Output::TT 0.04;  use WebPAC::Output::TT 0.06;
12  use WebPAC::Search::Estraier 0.05;  use WebPAC::Search::Estraier 0.05;
13  use File::Slurp;  use File::Slurp;
14  use Time::HiRes;  use Time::HiRes;
# Line 40  Configuration for hyperestraier in C<con Line 40  Configuration for hyperestraier in C<con
40    user: 'admin'    user: 'admin'
41    passwd: 'admin'    passwd: 'admin'
42    hits_on_page: 100    hits_on_page: 100
43      hits_for_pager: 1000
44    
45   webpac:   webpac:
46    db_path: '/data/webpac2/db'    db_path: '/data/webpac2/db'
# Line 113  sub new { Line 114  sub new {
114                  "'"                  "'"
115          );          );
116    
117            $self->{databases} = $c->config->{databases} || $log->error("can't find databases in config");
118    
119          return $self;          return $self;
120    
# Line 156  sub search { Line 158  sub search {
158    
159          my $template_filename = $args->{template} || $self->{template};          my $template_filename = $args->{template} || $self->{template};
160    
161          $args->{max} ||= $self->{'hits_on_page'};          $args->{max} ||= $self->{'hits_for_pager'};
162          if (! $args->{max}) {          if (! $args->{max}) {
163                  $args->{max} = 10;                  $args->{max} = 100;
164                  $log->warn("max not set when calling model. Using default of 10");                  $log->warn("max not set when calling model. Using default of $args->{max}");
165          }          }
166    
167          my $times;      # store some times for benchmarking          my $times;      # store some times for benchmarking
# Line 193  sub search { Line 195  sub search {
195          for my $i ( 0 .. $#results ) {          for my $i ( 0 .. $#results ) {
196    
197                  my ($database, $prefix, $id);                  my ($database, $prefix, $id);
198                  if ( $results[$i]->{'@uri'} =~ m!/([^/]+)/([^/]+)#(\d+)$!) {                  if ( $results[$i]->{'@uri'} =~ m!/([^/]+)/([^/]+)/(\d+)$!) {
199                          ($database, $prefix,$id) = ($1,$2,$3);                          ($database, $prefix,$id) = ($1,$2,$3);
200                  } else {                  } else {
201                          $log->warn("can't decode prefix#id from " .  $results[$i]->{'@uri'});                          $log->warn("can't decode database/prefix/id from " .  $results[$i]->{'@uri'});
202                          next;                          next;
203                  }                  }
204    
# Line 206  sub search { Line 208  sub search {
208    
209                  my $ds = $self->{db}->load_ds( database => $database, prefix => $prefix, id => $id );                  my $ds = $self->{db}->load_ds( database => $database, prefix => $prefix, id => $id );
210                  if (! $ds) {                  if (! $ds) {
211                          $log->error("can't load_ds( ${database}/${prefix}#${id} )");                          $log->error("can't load_ds( ${database}/${prefix}/${id} )");
212                          next;                          next;
213                  }                  }
214    
# Line 220  sub search { Line 222  sub search {
222                          template => $template_filename,                          template => $template_filename,
223                          data => $ds,                          data => $ds,
224                          record_uri => "${database}/${prefix}/${id}",                          record_uri => "${database}/${prefix}/${id}",
225                            config => $self->{databases}->{$database},
226                  );                  );
227    
228                  $times->{out} += time() - $t;                  $times->{out} += time() - $t;
# Line 286  sub record { Line 289  sub record {
289                  template => $args->{template},                  template => $args->{template},
290                  data => $ds,                  data => $ds,
291                  record_uri => $args->{record_uri},                  record_uri => $args->{record_uri},
292                    config => $self->{databases}->{$database},
293          );          );
294    
295          $html = $self->{iconv}->convert( $html ) || $log->error("can't convert: $html");          $html = $self->{iconv}->convert( $html ) || $log->error("can't convert: $html");
# Line 293  sub record { Line 297  sub record {
297          return $html;          return $html;
298  }  }
299    
300    
301  =head2 save_html  =head2 save_html
302    
303    $m->save_html( '/full/path/to/file', $content );    $m->save_html( '/full/path/to/file', $content );
# Line 315  sub save_html { Line 320  sub save_html {
320          $content =~ s/%u([a-fA-F0-9]{4})/_conv_js($1)/gex;          $content =~ s/%u([a-fA-F0-9]{4})/_conv_js($1)/gex;
321          $content =~ s/^[\n\r]+//s;          $content =~ s/^[\n\r]+//s;
322          $content =~ s/[\n\r]+$/\n/s;          $content =~ s/[\n\r]+$/\n/s;
323            $content =~ s/\n\r/\n/gs;
324    
325          my ($from, $to) = (          my ($from, $to) = (
326                  $self->{out_encoding},                  $self->{out_encoding},
Legend:
Removed from v.271  
changed lines
  Added in v.322
  ViewVC Help
Powered by ViewVC 1.1.26