Merged Apache2::MVC into Apache::MVC, deprecated $r->{query}

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

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index 58eda6a82b7eca73928c99a42de2e9d80a7edfc8..668b2c4430fa4b061d0343cf237dfd203a45ae2f 100644 (file)
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -21,10 +21,12 @@ sub paths {
 sub vars {
     my ($self, $r) = @_;
     my $class = $r->model_class;
+    my $base = $r->{config}->{uri_base};
+    $base =~ s/\/+$//;
     my %args = (
         request => $r,
         objects => $r->objects,
-        base    => $r->config->{uri_base},
+        base    => $base,
         config  => $r->config
         # ...
     ) ;
@@ -64,7 +66,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;