X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FTT.pm;h=433309e98a911f1d2fd2d2f58ec705ff09d005e9;hb=8ca69904b2ec6ca0e6ae8677fff6bb7283b20d13;hp=3ab23be31da7c14740d41ad80e666bddf376c180;hpb=01323f127ddaf8eb9bd9b9d9ea8bcd6a6fd8a49e;p=maypole.git diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm index 3ab23be..433309e 100644 --- a/lib/Maypole/View/TT.pm +++ b/lib/Maypole/View/TT.pm @@ -1,21 +1,28 @@ package Maypole::View::TT; -use Class::C3; use base 'Maypole::View::Base'; use Maypole::Constants; use Template; use File::Spec::Functions qw(catdir tmpdir); +use Template::Constants qw( :all ); -our $error_template; +our $error_template; { local $/; $error_template = ; } -our $VERSION = '2.11'; +our $VERSION = '2.13'; + +my $debug_flags = DEBUG_ON; use strict; sub template { my ( $self, $r ) = @_; unless ($self->{tt}) { - my $view_options = $r->config->view_options || {}; + my $view_options = $r->config->view_options || { POST_CHOMP=>1, PRE_CHOMP=>1, TRIM=>1 }; + if ($r->debug) { + $view_options->{DEBUG} = $debug_flags; + } + + $view_options->{POST_CHOMP} = 1 unless (exists $view_options->{POST_CHOMP}); $self->{provider} = Template::Provider->new($view_options); $self->{tt} = Template->new({ %$view_options, @@ -37,11 +44,13 @@ sub template { return OK; } else { if ($@) { - warn "fatal error in template '$template_file' : $@\n"; - $r->{error} = "fatal error in template '$template_file' : $@"; + my $error = "fatal error in template '$template_file' : $@\nTT paths : " . join(', ',$self->paths($r)) . "\n"; + $r->warn($error); + $r->{error} = $error; } else { - warn "TT error for template '$template_file'\n" . $self->{tt}->error; - $r->{error} = "TT error for template '$template_file'\n" . $self->{tt}->error; + 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; } @@ -52,20 +61,21 @@ sub report_error { my ($self, $r, $error, $type) = @_; my $output; - warn "self : $self, r : $r, error : $error, type : $type\n"; - # Need to be very careful here. my $tt = Template->new; unless (ref $r->{config}) { - warn "no config for this request\n"; + $r->warn("no config for this request"); $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), + paths => [ $self->paths($r) ], eval{$self->vars($r)} }, \$output )) { $r->{output} = $output; if ($tt->error) { $r->{output} = "Even the error template @@ -390,16 +400,14 @@ Simon Cozens __DATA__ Maypole error page -

Maypole application error

+

Maypole Application Error

This application living at [%request.config.uri_base%], [%request.config.application_name || "which is unnamed" %], has @@ -417,26 +425,31 @@ the path "[% request.path %]". The error text returned was:

Request details

- +
[% FOR attribute = ["model_class", "table", "template", "path", "content_type", "document_encoding", "action", "args", "objects"] %] - [% END %] + + + [% FOREACH param IN request.params %] + + [% END %]
[% attribute %] [% +
[% attribute %] [% request.$attribute.list.join(" , ") %]
CGI Parameters
[% param.key %] [% param.value %]

Website / Template Paths

- - + +
Base URI [% request.config.uri_base %]
Paths [% paths %]
Base URI [% request.config.uri_base %]
Paths [% paths %]

Application configuration

- - - - + + + +
Model [% request.config.model %]
View [% request.config.view %]
Classes [% request.config.classes.list.join(" , ") %]
Tables [% request.config.display_tables.list.join(" , ") %]
Model [% request.config.model %]
View [% request.config.view %]
Classes [% request.config.classes.list.join(" , ") %]
Tables [% request.config.display_tables.list.join(" , ") %]