/[Frey]/branches/zimbardo/lib/Frey/Web.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 /branches/zimbardo/lib/Frey/Web.pm

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

revision 455 by dpavlin, Wed Nov 19 15:28:23 2008 UTC revision 465 by dpavlin, Wed Nov 19 19:11:52 2008 UTC
# Line 1  Line 1 
1  package Frey::Web;  package Frey::Web;
2  use Moose::Role;  use Moose::Role;
3    
4    with 'Frey::Backtrace';
5    
6  use Frey::Types;  use Frey::Types;
7    
8  use Continuity::Widget::DomNode;  use Continuity::Widget::DomNode;
# Line 168  sub page { Line 170  sub page {
170          my $url = $self->request_url;          my $url = $self->request_url;
171          $url =~ s{\?reload=\d+}{};          $url =~ s{\?reload=\d+}{};
172    
173          my $body = $a->{body} || $self->as_markup;          my $body = $a->{body};
174          return $body if $self->content_type !~ m{html};          $body ||= $self->as_markup if $self->can('as_markup');
175          $body ||= '<!-- no body -->';          if ( $self->content_type !~ m{html} ) {
176                    warn "# return only $self body ", $self->content_type;
177                    return $body
178            } elsif ( ! defined $body ) {
179                    warn "# no body";
180                    $body = '<!-- no body -->';
181            }
182    
183          my $html = join("\n",          my $html = join("\n",
184                  qq|<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"><html><head>|,                  qq|<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"><html><head>|,
# Line 198  sub page { Line 206  sub page {
206  sub error {  sub error {
207          my $self = shift;          my $self = shift;
208          my $error = join(" ", @_);          my $error = join(" ", @_);
         my ($package, $filename, $line) = caller;  
         $error .= " at $filename line $line" if $error !~ m{ at };  
         warn "WARN: $error\n";  
         $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;  
         $error =~ s{(via package ")([\w:]+)(")}{$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;  
         return qq|<pre class="frey-error">$error</pre>|;  
 }  
209    
210  sub as_data {          my @backtrace = $self->backtrace;
211          my ($self) = @_;          $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
212          $self->data;  
213  }          warn "ERROR: $error\n";
214            $error =~ s{at\s+(\S+)\s+line\s+(\d+)}
215                    {at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;
216            $error =~ s{(via package ")([\w:]+)(")}
217                    {$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;
218    
219  sub as_sponge {          return qq|<pre class="frey-error">$error</pre>|;
         my ($self) = @_;  
         $self->sponge;  
220  }  }
221    
222  1;  1;
Legend:
Removed from v.455  
changed lines
  Added in v.465
  ViewVC Help
Powered by ViewVC 1.1.26