X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FTT.pm;h=7d28440137df92a93821074f2082ddd0d4b6b4d4;hb=1ec67be9e8b738cbd2a523523af3bd7e61f98480;hp=f012cbfb71b738ad213d39ed907fb8282b5cf16f;hpb=5c0dc9d3fea7db57178e06139d681f5fc115d00c;p=maypole.git diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm index f012cbf..7d28440 100644 --- a/lib/Maypole/View/TT.pm +++ b/lib/Maypole/View/TT.pm @@ -3,36 +3,86 @@ use base 'Maypole::View::Base'; use Maypole::Constants; use Template; use File::Spec::Functions qw(catdir tmpdir); +use Data::Dumper; + +our $error_template; +{ local $/; $error_template = ; } + +our $VERSION = '2.12'; use strict; -our $VERSION = "1." . sprintf "%04d", q$Rev$ =~ /: (\d+)/; sub template { - my ( $self, $r ) = @_; - - unless ($self->{tt}) { - my $view_options = $r->config->view_options || {}; - $self->{provider} = Template::Provider->new($view_options); - $self->{tt} = Template->new({ - %$view_options, - LOAD_TEMPLATES => [ $self->{provider} ], - }); + my ( $self, $r ) = @_; + unless ($self->{tt}) { + my $view_options = $r->config->view_options || {}; + if ($r->debug) { + $view_options->{DEBUG} = 0; + } + $self->{provider} = Template::Provider->new($view_options); + $self->{tt} = Template->new({ + %$view_options, + LOAD_TEMPLATES => [ $self->{provider} ], + }); + } + + $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; + my $processed_ok = eval{$self->{tt}->process($template_file, { $self->vars($r) }, \$output );}; + if ($processed_ok) { + $r->{output} = $output; + return OK; + } else { + if ($@) { + my $error = "fatal error in template '$template_file' : $@\nTT paths : " . join(', ',$self->paths($r)) . "\n"; + $r->warn($error); + $r->{error} = $error; + } else { + my $error = "TT error for template '$template_file'\n" . $self->{tt}->error . "\nTT paths : " . join(', ',$self->paths($r)) . "\n"; + $r->warn($error); + $r->{error} = $error; } + return ERROR; + } +} - $self->{provider}->include_path([ $self->paths($r) ]); +sub report_error { + my ($self, $r, $error, $type) = @_; my $output; - if ($self->{tt}->process( $r->template, { $self->vars($r) }, \$output )) { + + # Need to be very careful here. + my $tt = Template->new; + unless (ref $r->{config}) { + warn "no config for this request\n"; + $error .= '
There was a problem finding configuration for this request'; + $r->{config} ||= {}; + } + + $r->warn("report_error - reporting error to user : $error\n"); + + if ($tt->process(\$error_template, + { err_type => $type, error => $error, + config => $r->{config}, + request => $r, + paths => [ $self->paths($r) ], + 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; } - else { - $r->{error} = $self->{tt}->error; - return ERROR; - } + return ERROR; } -1; =head1 NAME @@ -48,16 +98,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