X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC%2FView%2FTT.pm;h=4c15ea9e28a3e0861409caf573c4aad3e75c19aa;hb=ce6a4c9c85fd9ea388abc677089564bc46e687be;hp=368c3ecc330546b01b42466788825ade02f16ddd;hpb=a0b702113b5a868698f65a5a88c35d91227a775f;p=maypole.git

diff --git a/lib/Apache/MVC/View/TT.pm b/lib/Apache/MVC/View/TT.pm
index 368c3ec..4c15ea9 100644
--- a/lib/Apache/MVC/View/TT.pm
+++ b/lib/Apache/MVC/View/TT.pm
@@ -1,4 +1,5 @@
 package Apache::MVC::View::TT;
+use Apache::Constants;
 use Lingua::EN::Inflect;
 use Template;
 use File::Spec;
@@ -10,10 +11,11 @@ sub new { bless {}, shift } # Not worth having
 
 sub _tt {
     my ($self, $r) = @_;
-    my $root = $r->config->{template_root};
+    my $root = $r->{ar}->document_root . "/". $r->{ar}->location;
+    warn "Root was $root";
     Template->new({ INCLUDE_PATH => [
         $root,
-        File::Spec->catdir($root, $r->model_class->moniker),
+        ($r->model_class && File::Spec->catdir($root, $r->model_class->moniker)),
         File::Spec->catdir($root, "custom"),
         File::Spec->catdir($root, "factory")
     ]});
@@ -27,24 +29,31 @@ sub _args {
         class   => $class,
         objects => $r->objects,
         base    => $r->config->{uri_base},
+        config  => $r->config
         # ...
-    );
-    $args{classmetadata} = {
-        name => $class,
-        columns => [ $class->columns ],
-        colnames => { $class->column_names },
-        moniker => $class->moniker,
-        plural  => $class->plural_moniker,
-        cgi => { $class->to_cgi },
-        description => $class->description
-    };
+    ) ;
+    if ($class) { 
+        $args{classmetadata} = {
+            name => $class,
+            columns => [ $class->columns ],
+            colnames => { $class->column_names },
+            related_accessors => [ $class->related($r) ],
+            moniker => $class->moniker,
+            plural  => $class->plural_moniker,
+            cgi => { $class->to_cgi },
+            description => $class->description
+        };
 
-    # User-friendliness facility for custom template writers.
-    if (@{$r->objects} > 1){
-        $args{$r->model_class->plural_moniker} = $r->objects;
-    } else {
-        ($args{$r->model_class->moniker}) = @{$r->objects};
+        # User-friendliness facility for custom template writers.
+        if (@{$r->objects || []} > 1) { 
+            $args{$r->model_class->plural_moniker} = $r->objects;
+        } else {
+            ($args{$r->model_class->moniker}) = @{$r->objects};
+        }
     }
+
+    # Overrides
+    %args = (%args, %{$r->{template_args}||{}});
     %args;
 }
 
@@ -52,8 +61,11 @@ sub process {
     my ($self, $r) = @_;
     my $template = $self->_tt($r);
     my $output;
+    warn "Processing ".$r->template;
     $template->process($r->template, { $self->_args($r) }, \$output)
-    || $self->error($r, $template->error);
+    || return $self->error($r, $template->error);
+
+    warn "And off it goes!\n";
     $r->{ar}->content_type("text/html");
     $r->{ar}->headers_out->set("Content-Length" => length $output);
     $r->{ar}->send_http_header;
@@ -63,7 +75,11 @@ sub process {
 
 sub error {
     my ($self, $r, $error) = @_;
+    warn $error;
+    if ($error =~ /not found$/) { return DECLINED }
     $r->{ar}->send_http_header("text/plain");
     $r->{ar}->print($error);
     exit;
 }
+
+1;