--- trunk/lib/Frey/Web.pm 2008/11/28 19:19:03 600
+++ trunk/lib/Frey/Web.pm 2008/11/28 23:34:26 611
@@ -16,6 +16,8 @@
use Frey::SVK;
+use Text::Tabs; # expand, unexpand
+
our @head;
sub head { @head }
@@ -61,7 +63,7 @@
is => 'rw',
isa => 'Int',
# required => 1, # FIXME we can't have required fields with defaults because Frey::Action isn't smart enough and asks for them
- default => 128,
+ default => 120,
);
my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"');
@@ -218,7 +220,7 @@
my $body = $a->{body};
if ( ! $body ) {
my $run = $a->{run} || 'as_markup';
- warn "# no body, invoke $self->$run";
+ warn "# no body, invoke $self->$run on ", ref($self);
$body = $self->$run;
}
if ( $self->content_type !~ m{html} ) {
@@ -467,12 +469,23 @@
$level ||= $self->debug,
my $path = $self->log_path;
- my $max = 50;
+ my $max = 30;
my $pos = 0;
my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines
my $line = 0;
my $multiline_end;
+ # XXX do we really want to do this every time?
+ my $css = qq|/* short css classes for levels */\n|;
+ my $level_to_class;
+ foreach ( keys %$warn_colors ) {
+ my $l = length($_);
+ my $class = 'l' . $l;
+ $css .= qq|.$class { color: $warn_colors->{$_} }\n|;
+ $level_to_class->{ $_ } = $class;
+ }
+ $self->add_css( $css );
+
open(my $log, '<', $path) || die "can't open $path: $!";
while(<$log>) {
chomp;
@@ -499,41 +512,47 @@
}
=cut
- if ( m{^(#*)\s+} ) { # FIXME
+ if ( m{^(#*)} ) {
- $style = $warn_colors->{$1}
- ? ' style="color:' . $warn_colors->{$1} . '"'
- : '';
+ my $level = $1;
+ my $msg = $_;
- my $msg = $self->html_escape( $_ );
my $spacer = ' ';
- if ( length($msg) > $self->html_dump_width ) {
- $msg = substr( $msg, 0, $self->html_dump_width );
+ my $real_msg = expand( $msg );
+ if ( length($real_msg) > $self->html_dump_width ) {
+
+ $real_msg = substr( $msg, 0, $self->html_dump_width );
+ $msg = unexpand( $real_msg );
$spacer = '…'
}
- $warnings[ $pos++ % $max ]
- = $msg
-# = ( $style ? qq|$msg| : $msg )
- . $spacer
- . qq|+$line
|;
- # FIXME should be but CSS hates me
+
+ $msg = $self->html_escape( $msg );
+
+ if ( my $class = $level_to_class->{ $level } ) {
+ $msg = qq|$msg|;
+ }
+
+ $msg .= $spacer .
+ qq|+$line\n|;
+
+ $warnings[ $pos++ % $max ] = $msg;
}
}
+ warn "log has $line lines tell position ",tell($log);
close($log) || die "can't close $path: $!";
my $size = -s $path;
- my $warnings = join('',
- map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. $max
+ my $warnings = join("",
+ map { $warnings[ ( $pos + $_ ) % $max ] || '' } 1 .. $max
);
my $s = length($warnings);
return
- # need to wrap into span so we can have links in warnings
+ # need to wrap editor link into span so we can have links in warnings
qq||
;
}