--- trunk/lib/Frey/Run.pm 2008/11/16 13:01:56 351 +++ trunk/lib/Frey/Run.pm 2008/11/16 14:07:13 353 @@ -103,39 +103,32 @@ } $html .= qq||; } else { - my $o; - eval { $o = $class->new( %{ $self->params } ); }; - if ( $@ ) { - return $self->page( title => $class, body => $self->error( $@ ) ); - } - $o->depends if $o->can('depends'); + eval { + my $o; + $o = $class->new( %{ $self->params } ); + $o->depends if $o->can('depends'); - if ( $self->run eq 'markup' ) { - warn "## using ",ref($o), "->markup"; - $html = eval { $o->markup }; - $html .= $self->error( $@ ) if $@; - warn ">>> markup $class ",length( $html ), " bytes\n"; - } elsif ( $self->run eq 'sponge' ) { - my $data = eval { $o->sponge }; - if ( $@ ) { - $html .= $self->error( $@ ); - } else { + if ( $self->run eq 'markup' ) { + warn "## using ",ref($o), "->markup"; + $html = $o->markup; + warn ">>> markup $class ",length( $html ), " bytes\n"; + } elsif ( $self->run eq 'sponge' ) { + my $data = $o->sponge; + confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH'; $html .= '
' . join(' | ', @{$data->{NAME}} ) . ' |
---|---|
' . join(' | ', @$_ ) . ' |
' . $self->html_dump( $data ) . '
';
+ } else {
+ $html = $self->error( "IGNORE: $class ", $o->dump );
}
- } else {
- $html = $self->error( "IGNORE: $class ", $o->dump );
- }
+ };
+
+ $html .= $self->error( $@ ) if $@;
}
return $self->page( title => $class, body => $html );