/[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 248 by dpavlin, Wed Dec 14 23:11:06 2005 UTC revision 293 by dpavlin, Sun Dec 18 23:35:24 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.05;
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 64  sub new { Line 64  sub new {
64          my $est_cfg = $c->config->{hyperestraier};          my $est_cfg = $c->config->{hyperestraier};
65          $est_cfg->{'log'} = $log;          $est_cfg->{'log'} = $log;
66    
67          $est_cfg->{encoding} = $est_cfg->{catalyst_encoding};          $est_cfg->{encoding} = $est_cfg->{catalyst_encoding} || $c->config->{catalyst_encoding} or $c->log->fatal("can't find catalyst_encoding");
68    
69          $log->debug("using config:" . Dumper($est_cfg) );          $log->debug("using config:" . Dumper($est_cfg) );
70    
# Line 193  sub search { Line 193  sub search {
193          for my $i ( 0 .. $#results ) {          for my $i ( 0 .. $#results ) {
194    
195                  my ($database, $prefix, $id);                  my ($database, $prefix, $id);
196                  if ( $results[$i]->{'@uri'} =~ m!/([^/]+)/([^/]+)#(\d+)$!) {                  if ( $results[$i]->{'@uri'} =~ m!/([^/]+)/([^/]+)/(\d+)$!) {
197                          ($database, $prefix,$id) = ($1,$2,$3);                          ($database, $prefix,$id) = ($1,$2,$3);
198                  } else {                  } else {
199                          $log->warn("can't decode prefix#id from " .  $results[$i]->{'@uri'});                          $log->warn("can't decode database/prefix/id from " .  $results[$i]->{'@uri'});
200                          next;                          next;
201                  }                  }
202    
# Line 206  sub search { Line 206  sub search {
206    
207                  my $ds = $self->{db}->load_ds( database => $database, prefix => $prefix, id => $id );                  my $ds = $self->{db}->load_ds( database => $database, prefix => $prefix, id => $id );
208                  if (! $ds) {                  if (! $ds) {
209                          $log->error("can't load_ds( ${database}/${prefix}#${id} )");                          $log->error("can't load_ds( ${database}/${prefix}/${id} )");
210                          next;                          next;
211                  }                  }
212    
# Line 315  sub save_html { Line 315  sub save_html {
315          $content =~ s/%u([a-fA-F0-9]{4})/_conv_js($1)/gex;          $content =~ s/%u([a-fA-F0-9]{4})/_conv_js($1)/gex;
316          $content =~ s/^[\n\r]+//s;          $content =~ s/^[\n\r]+//s;
317          $content =~ s/[\n\r]+$/\n/s;          $content =~ s/[\n\r]+$/\n/s;
318            $content =~ s/\n\r/\n/gs;
319    
320          my ($from, $to) = (          my ($from, $to) = (
321                  $self->{out_encoding},                  $self->{out_encoding},
Legend:
Removed from v.248  
changed lines
  Added in v.293
  ViewVC Help
Powered by ViewVC 1.1.26