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

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

revision 457 by dpavlin, Wed Nov 19 16:53:13 2008 UTC revision 468 by dpavlin, Wed Nov 19 19:59: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            $status_line
184                    .= qq|<span class="frey-popup">warn<code>|
185                    . $self->editor_links( join("", $self->warnings ) )
186                    . qq|</code></span>|
187                    if $self->warnings;
188    
189          my $html = join("\n",          my $html = join("\n",
190                  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 195  sub page { Line 209  sub page {
209          return $html;          return $html;
210  }  }
211    
212    sub editor_links {
213            my ( $self, $error ) = @_;
214    
215            $error =~ s{at\s+(\S+)\s+line\s+(\d+)}
216                    {at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;
217    
218            $error =~ s{(via package ")([\w:]+)(")}
219                    {$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;
220    
221            return $error;
222    }
223    
224  sub error {  sub error {
225          my $self = shift;          my $self = shift;
226          my $error = join(" ", @_);          my $error = join(" ", @_);
227          my ($package, $filename, $line) = caller;  
228          $error .= " at $filename line $line" if $error !~ m{ at };          my @backtrace = $self->backtrace;
229          warn "WARN: $error\n";          $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
230          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;  
231          $error =~ s{(via package ")([\w:]+)(")}{$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;          warn "ERROR: $error\n";
232          return qq|<pre class="frey-error">$error</pre>|;          return
233                    qq|<pre class="frey-error">|
234                    . $self->editor_links( $error ) .
235                    qq|</pre>|
236                    ;
237  }  }
238    
239  1;  1;
Legend:
Removed from v.457  
changed lines
  Added in v.468
  ViewVC Help
Powered by ViewVC 1.1.26