X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FBase.pm;h=1cc9b2bd8f78a9efc906275991eee2765ffb310e;hb=29550a30ca082a8f1f1d0cb1b4a92eb39bc3dd84;hp=312d38ba24aeeb3f3e70809776a788433751a5f2;hpb=d2c852208417c014caec0436a677fcadccc197d8;p=maypole.git

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index 312d38b..1cc9b2b 100644
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -10,17 +10,28 @@ sub new { bless {}, shift }    # By default, do nothing.
 sub paths {
     my ( $self, $r ) = @_;
     my $root = $r->config->template_root || $r->get_template_root;
-    return (
-        $root,
-        (
-            $r->model_class
-              && File::Spec->catdir( $root, $r->model_class->moniker )
-        ),
-        File::Spec->catdir( $root, "custom" ),
-        File::Spec->catdir( $root, "factory" )
-    );
+    if(ref($root) ne 'ARRAY') {
+	$root = [ $root ];
+    }
+    my @output = ();
+    foreach my $path (@$root) {
+	push(@output, $path);
+	push(@output,
+	     (
+              $r->model_class
+	      && File::Spec->catdir( $path, $r->model_class->table )
+	      )
+	     );
+	push(@output, File::Spec->catdir( $path, "custom" ));
+	push(@output, File::Spec->catdir( $path, "factory" ));
+    }
+
+    return @output;
 }
 
+
+
+
 sub vars {
     my ( $self, $r ) = @_;
     my $class = $r->model_class;
@@ -30,7 +41,8 @@ sub vars {
         request => $r,
         objects => $r->objects,
         base    => $base,
-        config  => $r->config
+        config  => $r->config,
+	object  => $r->object,
 
           # ...
     );
@@ -45,6 +57,7 @@ sub vars {
         $classmeta->{moniker}           ||= $class->moniker;
         $classmeta->{plural}            ||= $class->plural_moniker;
         $classmeta->{cgi}               ||= { $class->to_cgi };
+	$classmeta->{stringify_column}  ||= $class->stringify_column;
 
         # User-friendliness facility for custom template writers.
         if ( @{ $r->objects || [] } > 1 ) {
@@ -62,8 +75,6 @@ sub vars {
 
 sub process {
     my ( $self, $r ) = @_;
-    $r->{content_type}      ||= "text/html";
-    $r->{document_encoding} ||= "utf-8";
     my $status = $self->template($r);
     return $self->error($r) if $status != OK;
     return OK;
@@ -72,38 +83,41 @@ sub process {
 sub error {
     my ( $self, $r, $desc ) = @_;
     $desc = $desc ? "$desc: " : "";
-    carp $desc . $r->{error};
     if ( $r->{error} =~ /not found$/ ) {
-
+	warn "template not found error : ", $r->{error};
         # This is a rough test to see whether or not we're a template or
         # a static page
         return -1 unless @{ $r->{objects} || [] };
 
+	my $template_error = $r->{error};
         $r->{error} = <<EOF;
+<h1> Template not found </h1>
 
-<H1> Template not found </H1>
+A template was not found while processing the following request:
 
-This template was not found while processing the following request:
+<strong>@{[$r->{action}]}</strong> on table
+<strong>@{[ $r->{table} ]}</strong> with objects:
 
-<B>@{[$r->{action}]}</B> on table <B>@{[ $r->{table} ]}</B> with objects:
-
-<PRE>
+<pre>
 @{[join "\n", @{$r->{objects}}]}
-</PRE>
+</pre>
+
 
-Looking for template <B>@{[$r->{template}]}</B> in paths:
+The main template is <strong>@{[$r->{template}]}</strong>.
+The template subsystem's error message was
+<pre>
+$template_error
+</pre>
+We looked in paths:
 
-<PRE>
+<pre>
 @{[ join "\n", $self->paths($r) ]}
-</PRE>
+</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;
 }