Be a bit friendlier on returning "not found" errors.

[maypole.git] / lib / Maypole / View / Base.pm

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index 37ca4318d32304a42977e1cb996c36eb0ea5152b..8229d2193387f1c7b8c0f9862d882f35d75f05ba 100644 (file)
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -38,7 +38,6 @@ sub vars {
             moniker => $class->moniker,
             plural  => $class->plural_moniker,
             cgi => { $class->to_cgi },
-            description => $class->description
         };
 
         # User-friendliness facility for custom template writers.
@@ -65,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} = <<EOF;
+
+<H1> Template not found </H1>
+
+This template was not found while processing the following request:
+
+<B>@{[$r->{action}]}</B> on table <B>@{[ $r->{table} ]}</B> with objects:
+
+<PRE>
+@{[join "\n", @{$r->{objects}}]}
+</PRE>
+
+Looking for template <B>@{[$r->{template}]}</B> in paths:
+
+<PRE>
+@{[ join "\n", $self->paths($r) ]}
+</PRE>
+EOF
+        $r->{content_type} = "text/html";
+        $r->{output} = $r->{error};
+        return OK;
+    }
     $r->{content_type} = "text/plain";
     $r->{output} = $r->{error};
     $r->send_output;