X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FTT.pm;h=7d28440137df92a93821074f2082ddd0d4b6b4d4;hb=1ec67be9e8b738cbd2a523523af3bd7e61f98480;hp=78aad9325199f07101d71afbffa116540d2f9cac;hpb=3cf2fea8686cea17e128789566a0cd55f2046833;p=maypole.git diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm index 78aad93..7d28440 100644 --- a/lib/Maypole/View/TT.pm +++ b/lib/Maypole/View/TT.pm @@ -3,46 +3,53 @@ use base 'Maypole::View::Base'; use Maypole::Constants; use Template; use File::Spec::Functions qw(catdir tmpdir); +use Data::Dumper; -our $error_template; +our $error_template; { local $/; $error_template = ; } +our $VERSION = '2.12'; + use strict; -our $VERSION = 2.11; 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}->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; + $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 { - if ($@) { - warn "fatal error in template '$template_file' : $@\n"; - $r->{error} = "fatal error in template '$template_file' : $@"; - } else { - warn "TT error for template '$template_file'\n" . $self->{tt}->error; - $r->{error} = "TT error for template '$template_file'\n" . $self->{tt}->error; - } - return 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; + } } @@ -50,8 +57,6 @@ 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}) { @@ -59,11 +64,14 @@ sub report_error { $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 @@ -287,6 +295,18 @@ truncate, format, escape or encode trivially. A useful selection is included with Template Toolkit and they can also be found on CPAN or can be written easily. See L. +TT provides stderr and stdout filters, which allow you to write handy macros +like this one to output debug information to your web server log, etc : + +=over 4 + +[% MACRO debug_msg(text) + FILTER stderr; "[TT debug_msg] $text\n"; END; +%] + +=back + + TT Macros allow you to reuse small blocks of content, directives, etc. The MACRO directive allows you to define a directive or directive block which is then evaluated each time the macro is called. Macros can be passed named parameters @@ -409,6 +429,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