--- trunk/lib/Frey/Web.pm 2008/11/19 16:53:13 457
+++ trunk/lib/Frey/Web.pm 2008/11/19 17:57:48 460
@@ -168,9 +168,15 @@
my $url = $self->request_url;
$url =~ s{\?reload=\d+}{};
- my $body = $a->{body} || $self->as_markup;
- return $body if $self->content_type !~ m{html};
- $body ||= '';
+ my $body = $a->{body};
+ $body ||= $self->as_markup if $self->can('as_markup');
+ if ( $self->content_type !~ m{html} ) {
+ warn "# return only $self body ", $self->content_type;
+ return $body
+ } elsif ( ! defined $body ) {
+ warn "# no body";
+ $body = '';
+ }
my $html = join("\n",
qq||,
@@ -198,9 +204,28 @@
sub error {
my $self = shift;
my $error = join(" ", @_);
- my ($package, $filename, $line) = caller;
- $error .= " at $filename line $line" if $error !~ m{ at };
- warn "WARN: $error\n";
+
+ my @backtrace;
+ foreach ( 0 .. 5 ) {
+ 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 );
+ }
+
+ warn "ERROR: $error\n";
$error =~ s{at\s+(\S+)\s+line\s+(\d+)}{at $1 line $2}gsm;
$error =~ s{(via package ")([\w:]+)(")}{$1$2$3}gsm;
return qq|$error
|;