/[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 460 by dpavlin, Wed Nov 19 17:57:48 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 178  sub page { Line 180  sub page {
180                  $body = '<!-- no body -->';                  $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>|,
191                  $self->_head_html,                  $self->_head_html,
# Line 201  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    
228          my @backtrace;          my @backtrace = $self->backtrace;
229          foreach ( 0 .. 5 ) {          $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
                 my @caller = caller($_) or last;  
                 my @description = ( qw/  
                         package filename line  
                         subroutine hasargs  
                         wantarray evaltext is_require  
                         hints bitmask hinthash  
                 /);  
                 push @backtrace, join(' ',  
                         map {  
                                 $description[$_] . ': ' . dump $caller[$_]  
                         } ( 0 .. $#caller )  
                 );  
         }  
         if ( @backtrace ) {  
                 warn "# append backtrace: ", dump( @backtrace );  
                 $error .= "\n\t" . join( "\n\t", @backtrace );  
         }  
230    
231          warn "ERROR: $error\n";          warn "ERROR: $error\n";
232          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;          return
233          $error =~ s{(via package ")([\w:]+)(")}{$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;                  qq|<pre class="frey-error">|
234          return qq|<pre class="frey-error">$error</pre>|;                  . $self->editor_links( $error ) .
235                    qq|</pre>|
236                    ;
237  }  }
238    
239  1;  1;
Legend:
Removed from v.460  
changed lines
  Added in v.468
  ViewVC Help
Powered by ViewVC 1.1.26