X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=blobdiff_plain;f=lib%2FMaypole%2FView%2FTT.pm;h=8759e0cba9206754a24783b7b82de80cb0e1d8f9;hp=ac2aceb1b190e777e7e0200f28182f72d9890cc1;hb=0aed36464b4d092c9e32f70916fb38a1bb124ab6;hpb=79aa8d27d124d06bf88b2fc0487ae97563b98936 diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm index ac2aceb..8759e0c 100644 --- a/lib/Maypole/View/TT.pm +++ b/lib/Maypole/View/TT.pm @@ -3,18 +3,26 @@ 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, @@ -36,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; } @@ -51,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 @@ -422,6 +433,11 @@ the path "[% request.path %]". The error text returned was: [% attribute %] [% request.$attribute.list.join(" , ") %] [% END %] + + CGI Parameters + [% FOREACH param IN request.params %] + [% param.key %] [% param.value %] + [% END %]

Website / Template Paths