+
+=cut
+
sub error {
my $self = shift;
my $error = join(" ", @_);
- my @backtrace = $self->backtrace;
- $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
+ my $fatal = '';
+
+ if ( $error !~ m{\n$} ) {
+ if ( my @backtrace = $self->backtrace ) {
+ $error .= "\n\t" . join( "\n\t", @backtrace );
+ $fatal = qq| frey-fatal|;
+ }
+ }
warn "ERROR: $error\n";
return
- qq||
- . $self->editor_links( $error ) .
+ qq||
+ . $self->html_links( $error ) .
qq|
|
;
}
@@ -461,19 +495,31 @@
'"' => '"',
};
+=for later
+
my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
+=cut
+
sub log_path {
$Frey::Bootstrap::log_path || die "no log_path?";
}
-our $last_log_pos = 0;
-our $last_log_line = 0;
-
our $pwd = `pwd`;
chomp $pwd;
+sub strip_full_path {
+ my ($self, $msg) = @_;
+ # Mojo seems to expand warn messages to full path which is annoying
+ $msg =~ s{/[^/]+/\.\./}{/}gs;
+ $msg =~ s{$pwd/*}{}gs;
+ return $msg;
+}
+
+our $last_log_pos = 0;
+our $last_log_line = 0;
+
sub warnings_html {
my ($self,$level) = shift;
$level ||= $self->debug,
@@ -528,11 +574,7 @@
if ( m{^(#*)} ) {
my $level = $1;
- my $msg = $_;
-
- # Mojo seems to expand warn messages to full path which is annoying
- $msg =~ s{/[^/]+/\.\./}{/}gs;
- $msg =~ s{$pwd/*}{}gs;
+ my $msg = $self->strip_full_path( $_ );
my $spacer = ' ';
my $real_msg = expand( $msg );
@@ -573,7 +615,7 @@
return
# need to wrap editor link into span so we can have links in warnings
qq||
;
}
@@ -600,10 +642,28 @@
) = caller($_) or last;
push @backtrace,
- qq|via $package at $path line $line|;
+ qq|via "$package" at $path line $line|;
}
#warn "# backtrace: ", dump( @backtrace ) if @backtrace;
return @backtrace;
}
+=head2 checkbox
+
+Generate checkbox html markup from some attribute
+
+ my $html = $self->checkbox('attribute_name', $value);
+
+=cut
+
+sub checkbox {
+ my ($self,$name,$value) = @_;
+ my $checked = '';
+ my $all_checkboxes = $self->$name;
+ $all_checkboxes = [ $all_checkboxes ] unless ref($all_checkboxes) eq 'ARRAY'; # sigh, too chatty
+ $checked = ' checked' if grep { $_ eq $value } @$all_checkboxes;
+ warn "# checkbox $name $value $checked\t", $self->dump( $self->$name );
+ qq||;
+}
+
1;