/[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 678 by dpavlin, Tue Dec 2 02:05:55 2008 UTC revision 682 by dpavlin, Tue Dec 2 17:36:51 2008 UTC
# Line 86  sub html_dump { Line 86  sub html_dump {
86          $dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs;          $dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs;
87          $dump = $self->html_escape( $dump );          $dump = $self->html_escape( $dump );
88          $dump =~ s{\Q...\E}{…}gs;          $dump =~ s{\Q...\E}{…}gs;
89  #       $dump =~ $self->editor_links( $dump ); # FIXME include this  #       $dump =~ $self->html_links( $dump ); # FIXME include this
90          return "<code>$dump</code>";          return "<code>$dump</code>";
91  }  }
92    
# Line 304  sub editor { Line 304  sub editor {
304          qq|>$class</a>|;          qq|>$class</a>|;
305  }  }
306    
307  =head2 editor_links  =head2 html_links
308    
309  Create HTML links to editor for perl error message  Create HTML links to editor for perl error message
310    
311    my $html = $self->editor_links( $error )    my $html = $self->html_links( $error )
312    
313  =cut  =cut
314    
315  sub editor_links {  sub html_links {
316          my ( $self, $error ) = @_;          my ( $self, $error ) = @_;
317    
318            $error = $self->strip_full_path( $error );
319    
320  #       $error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][<span class="frey-dropdown">$1<code>$2</code>$3</span>]gs; # FIXME insert bless hiding back  #       $error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][<span class="frey-dropdown">$1<code>$2</code>$3</span>]gs; # FIXME insert bless hiding back
321    
322          # perl's backtrace          # perl's backtrace
# Line 333  sub editor_links { Line 335  sub editor_links {
335                  {$1<a target="$2" href="/Frey::Shell::Grep/as_markup?pattern=$2" title="grep $2">$2</a>$3}gsm;                  {$1<a target="$2" href="/Frey::Shell::Grep/as_markup?pattern=$2" title="grep $2">$2</a>$3}gsm;
336    
337          # link paths to editor          # link paths to editor
338          $error =~ s{(lib/[\w/]+\.pm)(\s+(\d+)\s+bytes)}          $error =~ s{((?:lib|t)/[\S]+)\s+(\d+\s+bytes)}
339                  {<a target="editor" href="/editor+$1+1" title="vi $1">$1</a>}gsm;                  {<a target="editor" href="/editor+$1+1" title="vi $1 [$2]">$1</a>}gsm;
340    
341            $error =~ s{(class ")([\w:]+)(")}
342                    {$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm;
343    
344          return $error;          return $error;
345  }  }
# Line 362  sub error { Line 367  sub error {
367          warn "ERROR: $error\n";          warn "ERROR: $error\n";
368          return          return
369                  qq|<pre class="frey-error$fatal">|                  qq|<pre class="frey-error$fatal">|
370                  . $self->editor_links( $error ) .                  . $self->html_links( $error ) .
371                  qq|</pre>|                  qq|</pre>|
372                  ;                  ;
373  }  }
# Line 501  sub log_path { Line 506  sub log_path {
506          $Frey::Bootstrap::log_path || die "no log_path?";          $Frey::Bootstrap::log_path || die "no log_path?";
507  }  }
508    
 our $last_log_pos  = 0;  
 our $last_log_line = 0;  
   
509  our $pwd = `pwd`;  our $pwd = `pwd`;
510  chomp $pwd;  chomp $pwd;
511    
512    sub strip_full_path {
513            my ($self, $msg) = @_;
514            # Mojo seems to expand warn messages to full path which is annoying
515            $msg =~ s{/[^/]+/\.\./}{/}gs;
516            $msg =~ s{$pwd/*}{}gs;
517            return $msg;
518    }
519    
520    our $last_log_pos  = 0;
521    our $last_log_line = 0;
522    
523  sub warnings_html {  sub warnings_html {
524          my ($self,$level) = shift;          my ($self,$level) = shift;
525          $level ||= $self->debug,          $level ||= $self->debug,
# Line 561  sub warnings_html { Line 574  sub warnings_html {
574                  if ( m{^(#*)} ) {                  if ( m{^(#*)} ) {
575    
576                          my $level = $1;                          my $level = $1;
577                          my $msg = $_;                          my $msg = $self->strip_full_path( $_ );
   
                         # Mojo seems to expand warn messages to full path which is annoying  
                         $msg =~ s{/[^/]+/\.\./}{/}gs;  
                         $msg =~ s{$pwd/*}{}gs;  
578    
579                          my $spacer = ' ';                          my $spacer = ' ';
580                          my $real_msg = expand( $msg );                          my $real_msg = expand( $msg );
# Line 606  sub warnings_html { Line 615  sub warnings_html {
615          return          return
616                  # need to wrap editor link into span so we can have links in warnings                  # need to wrap editor link into span so we can have links in warnings
617                    qq|<span class="frey-popup"><a target="editor" href="/editor+$path+$line" title="$path \| $size -> $s bytes \| $line -> $pos lines \| level $level">warn</a><code>|                    qq|<span class="frey-popup"><a target="editor" href="/editor+$path+$line" title="$path \| $size -> $s bytes \| $line -> $pos lines \| level $level">warn</a><code>|
618                  . $self->editor_links( $warnings )                  . $self->html_links( $warnings )
619                  . qq|</code></span>|                  . qq|</code></span>|
620                  ;                  ;
621  }  }
Legend:
Removed from v.678  
changed lines
  Added in v.682
  ViewVC Help
Powered by ViewVC 1.1.26