--- trunk/lib/Frey/Pipe.pm 2008/11/19 19:28:09 467 +++ trunk/lib/Frey/Pipe.pm 2008/11/25 17:15:18 519 @@ -35,19 +35,19 @@ my $out; my $pipe; - $self->title( ref($self) . ' | ' . $self->pipe ); + $self->title( $self->pipe ); + + my @parts; foreach my $part ( split(/\|/, $self->pipe ) ) { warn "# part: '$part'"; if ( $part =~ m{^([^/]+)/([^\+\?]+)(.*)?$} ) { my ( $class, $method, $args ) = ( $1, $2, $3 ); - push @{ $self->status }, { $class => { method => $method, args => $args } }; my $params = $pipe; $params = {} unless defined $params; if ( defined $args ) { $args =~ s{^[\?\+\s]}{}; warn "# class $class method $method args '$args'", $pipe ? " pipe args " . join(',',keys %$pipe) : '' if $self->debug; - push @{ $self->status }, { $class =>$args }; map { my ( $name, $value ) = ( $1, $2 ) if m{^([^=]+)=(.+)$} || confess "can't parse '$_'"; $params->{$name} = $value; @@ -62,6 +62,8 @@ my $result = $o->$method; warn "# result ",length( $result ), " bytes ", ref($result); + $self->add_status({ $part => { $class => { method => $method, args => $args } } }); + $self->content_type( $o->content_type ) if $o->can('content_type'); $out = $result; @@ -72,8 +74,6 @@ } } - warn "# pipe ", $self->title; - return $out; }