X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2FMaypole%2FView%2FBase.pm;h=668b2c4430fa4b061d0343cf237dfd203a45ae2f;hb=5c199c0e9cd05a00bfc04d9688982979a41f3ee8;hp=eaff544adaabc56f61e8b4a45c6170a45ef5c9c3;hpb=dfcd338e0693370eeaa95ca1f4ef8c742221b348;p=maypole.git

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index eaff544..668b2c4 100644
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -2,6 +2,7 @@ package Maypole::View::Base;
 use File::Spec;
 use UNIVERSAL::moniker;
 use strict;
+use Maypole::Constants;
 
 sub new { bless {}, shift } # By default, do nothing.
 
@@ -20,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
         # ...
     ) ;
@@ -37,7 +40,6 @@ sub vars {
             moniker => $class->moniker,
             plural  => $class->plural_moniker,
             cgi => { $class->to_cgi },
-            description => $class->description
         };
 
         # User-friendliness facility for custom template writers.
@@ -53,33 +55,48 @@ sub vars {
     %args;
 }
 
-sub do_it {
-    my ($self, $r) = @_;
-    my $template = Template->new({ INCLUDE_PATH => [ $self->paths($r) ]});
-    my $output;
-    if ($template->process($r->template, { $self->args($r) }, \$output)) {
-        $r->{output} = $output;
-        return 1;
-    } else { 
-         $r->{error} = $template->error;
-    }
-
-}
-
 sub process {
     my ($self, $r) = @_;
-    $self->template($r) || return $self->error($r);
+    my $status = $self->template($r);
+    return $self->error($r) if $status != OK;
     $r->{content_type} ||= "text/html";
-    return 200;
+    return OK;
 }
 
 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;
+    return ERROR;
 }
 
 sub template { die shift()." didn't define a decent template method!" }