X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FBase.pm;h=8229d2193387f1c7b8c0f9862d882f35d75f05ba;hb=5c9dc9134cf6a75aa65f91dc5eb02c4a294d21b8;hp=58eda6a82b7eca73928c99a42de2e9d80a7edfc8;hpb=fafd8d81987fbb130e02b89ed55c78a6cc34127a;p=maypole.git diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm index 58eda6a..8229d21 100644 --- a/lib/Maypole/View/Base.pm +++ b/lib/Maypole/View/Base.pm @@ -64,7 +64,33 @@ sub process { sub error { my ($self, $r) = @_; warn $r->{error}; - if ($r->{error} =~ /not found$/) { return -1 } + if ($r->{error} =~ /not found$/) { + # This is a rough test to see whether or not we're a template or + # a static page + return -1 unless @{$r->{objects}||[]}; + + $r->{error} = < Template not found + +This template was not found while processing the following request: + +@{[$r->{action}]} on table @{[ $r->{table} ]} with objects: + +
+@{[join "\n", @{$r->{objects}}]}
+
+ +Looking for template @{[$r->{template}]} in paths: + +
+@{[ join "\n", $self->paths($r) ]}
+
+EOF + $r->{content_type} = "text/html"; + $r->{output} = $r->{error}; + return OK; + } $r->{content_type} = "text/plain"; $r->{output} = $r->{error}; $r->send_output;