--- trunk/lib/Frey/Web.pm	2008/12/02 01:16:20	670
+++ trunk/lib/Frey/Web.pm	2008/12/02 01:31:32	671
@@ -225,7 +225,13 @@
 	if ( ! $body ) {
 		my $run = $a->{run} || 'as_markup';
 		warn "# no body, invoke $self->$run on ", ref($self);
-		$body = $self->$run;
+		eval {
+			$body = $self->$run;
+		};
+		$body
+			= $self->error( $@ )
+			. $self->dropdown( self => $self )
+			if $@;
 	}
 	if ( $self->content_type !~ m{html} ) {
 		warn "# return only $self body ", $self->content_type;
@@ -314,25 +320,48 @@
 
 #	$error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][<span class="frey-dropdown">$1<code>$2</code>$3</span>]gs; # FIXME insert bless hiding back
 
+	# perl's backtrace
 	$error =~ s{at\s+(\S+)\s+line\s+(\d+)}
 		{at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;
 
+	# our backtrace
 	$error =~ s{(via (?:package) "?)([\w:]+)("?)}
 		{$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;
 
+	# method error messages
+#	$error =~ s{(method ")(\w+)"}
+#		{$1<a target="/Frey::Shell::Grep?pattern=$2">$2</a>"}gsm; # FIXME replace with link to Frey::Introspect data
+
+	# anything that looks like Class::Name=
+	$error =~ s{(\w+(?:::\w+)+)=}
+		{<a target="$1" href="/$1">$1</a>=}gsm;
+
 	return $error;
 }
 
+=head2 error
+
+This method will return error to browser and backtrace unless
+error message ends with LF C<\n> just like L<warn>
+
+=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| class="fatal"|;
+		}
+	}
 
 	warn "ERROR: $error\n";
 	return
-		qq|<pre class="frey-error">|
+		qq|<pre class="frey-error$fatal">|
 		. $self->editor_links( $error ) .
 		qq|</pre>|
 		;
@@ -461,9 +490,13 @@
 	'"' => '"',
 };
 
+=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?";
 }