X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FTT.pm;h=7106b7a563f0d5593fdbe3860752aa488b1b575f;hb=28823167d12d4cd1419cc6a58900c0fc5819e1af;hp=40fa5651dcc9480db76f856e5f1a0a40e8aeb44b;hpb=8617321ebf13ce6b63d41a65a003d153f2b5cc5e;p=maypole.git diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm index 40fa565..7106b7a 100644 --- a/lib/Maypole/View/TT.pm +++ b/lib/Maypole/View/TT.pm @@ -4,22 +4,19 @@ use Maypole::Constants; use Template; use File::Spec::Functions qw(catdir tmpdir); +our $error_template; +{ local $/; $error_template = ; } + use strict; -our $VERSION = "1." . sprintf "%04d", q$Rev$ =~ /: (\d+)/; +our $VERSION = 2.11; sub template { my ( $self, $r ) = @_; unless ($self->{tt}) { my $view_options = $r->config->view_options || {}; - (my $driver_name = ref $r) =~ s/::/_/g; - my $compile_dir = catdir(tmpdir(), $driver_name); - $self->{provider} = Template::Provider->new( - COMPILE_DIR => $compile_dir, - %$view_options, - ); + $self->{provider} = Template::Provider->new($view_options); $self->{tt} = Template->new({ - COMPILE_DIR => $compile_dir, %$view_options, LOAD_TEMPLATES => [ $self->{provider} ], }); @@ -27,18 +24,42 @@ sub template { $self->{provider}->include_path([ $self->paths($r) ]); + my $template_file = $r->template; + my $ext = $r->config->template_extension; + $template_file .= $ext if defined $ext; + my $output; - if ($self->{tt}->process( $r->template, { $self->vars($r) }, \$output )) { + if ($self->{tt}->process($template_file, { $self->vars($r) }, \$output )) { $r->{output} = $output; return OK; } else { - $r->{error} = $self->{tt}->error; + $r->{error} = "TT error for template '$template_file'\n" . $self->{tt}->error; return ERROR; } } -1; + +sub report_error { + my ($self, $r, $error, $type) = @_; + my $output; + # Need to be very careful here. + my $tt = Template->new; + if ($tt->process(\$error_template, + { err_type => $type, error => $error, + config => { %{$r->{config}}}, + request => $r, # We have that at least + eval{$self->vars($r)} }, \$output )) { + $r->{output} = $output; + if ($tt->error) { $r->{output} = "Even the error template + errored - ".$tt->error.""; } + $r->{content_type} ||= "text/html"; + $r->{document_encoding} ||= "utf-8"; + return OK; + } + return ERROR; +} + =head1 NAME @@ -54,16 +75,27 @@ Maypole::View::TT - A Template Toolkit view class for Maypole COMPILE_DIR => '/var/tmp/mysite/templates', } ); + ..... + + [% PROCESS macros %] + + [% pager %] + + [% link %] + + [% maybe_link_view %] + =head1 DESCRIPTION -This is the default view class for Maypole; it uses the Template Toolkit -to fill in templates with the objects produced by Maypole's model classes. -Please see the Maypole manual, and in particular, the C chapter, -for the template variables available and for a refresher on how template -components are resolved. +This is the default view class for Maypole; it uses the Template Toolkit to fill +in templates with the objects produced by Maypole's model classes. Please see +the L, and in particular, the +L chapter for the template variables available and +for a refresher on how template components are resolved. The underlying Template toolkit object is configured through -C<$r-Econfig-Eview_options>. See L