X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FTT.pm;h=b7a59a2f565813c9a5c3c4a7ffaee12d845ac232;hb=1c8db728a3fb5adb4f0ea876ea1316457700edf8;hp=f634ca8fedb7604ef9d97af249bcfc738f746bd7;hpb=29550a30ca082a8f1f1d0cb1b4a92eb39bc3dd84;p=maypole.git diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm index f634ca8..b7a59a2 100644 --- a/lib/Maypole/View/TT.pm +++ b/lib/Maypole/View/TT.pm @@ -8,47 +8,49 @@ our $error_template; { local $/; $error_template = ; } 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} ], - }); - } - - $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; + 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} ], + }); + } + + $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 ($@) { + warn "fatal error in template '$template_file' : $@\n"; + $r->{error} = "fatal error in template '$template_file' : $@"; } 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; + 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; + } } 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}) { @@ -57,10 +59,11 @@ sub report_error { $r->{config} ||= {}; } if ($tt->process(\$error_template, - { err_type => $type, error => $error, + { err_type => $type, error => $error, config => $r->{config}, request => $r, - eval{$self->vars($r)} }, \$output )) { + paths => $self->paths($r), + eval{$self->vars($r)} }, \$output )) { $r->{output} = $output; if ($tt->error) { $r->{output} = "Even the error template errored - ".$tt->error.""; } @@ -283,6 +286,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 @@ -399,23 +414,27 @@ 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 %]
[% attribute %] [% +
[% attribute %] [% request.$attribute.list.join(" , ") %]
+

Website / Template Paths

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

Application configuration

- - [% FOR field IN config %] - - [% END %] +
[% field.key %] [% - $field.value.list.join(" , ") %]
+ + + +
Model [% request.config.model %]
View [% request.config.view %]
Classes [% request.config.classes.list.join(" , ") %]
Tables [% request.config.display_tables.list.join(" , ") %]
- -