$root = [ $root ];
}
my @output = ();
+ my $i = 0;
foreach my $path (@$root) {
- push(@output, $path);
push(@output,
(
$r->model_class
- && File::Spec->catdir( $path, $r->model_class->moniker )
+ && File::Spec->catdir( $path, $r->model_class->table )
)
);
- push(@output, File::Spec->catdir( $path, "custom" ));
- push(@output, File::Spec->catdir( $path, "factory" ));
+ push(@output, File::Spec->catdir( $path, "custom" )) unless ($i);
+ push(@output, $path);
+ push(@output, File::Spec->catdir( $path, "factory" )) unless ($i);
+ $i = 1;
}
- return @output;
-}
-
-
+ return grep( $_, @output);
+}
sub vars {
my ( $self, $r ) = @_;
request => $r,
objects => $r->objects,
base => $base,
- config => $r->config
-
- # ...
+ config => $r->config,
);
+
+ $args{object} = $r->object if ($r->can('object'));
+
if ($class) {
my $classmeta = $r->template_args->{classmetadata} ||= {};
$classmeta->{name} ||= $class;
$classmeta->{table} ||= $class->table;
- $classmeta->{columns} ||= [ $class->display_columns ];
- $classmeta->{list_columns} ||= [ $class->list_columns ];
- $classmeta->{colnames} ||= { $class->column_names };
+ $classmeta->{columns} ||= [ $class->display_columns ] if ($class->can('display_columns'));
+ $classmeta->{list_columns} ||= [ $class->list_columns ] if ($class->can('list_columns'));
+ $classmeta->{colnames} ||= { $class->column_names } if ($class->can('column_names'));
$classmeta->{related_accessors} ||= [ $class->related($r) ];
$classmeta->{moniker} ||= $class->moniker;
$classmeta->{plural} ||= $class->plural_moniker;
- $classmeta->{cgi} ||= { $class->to_cgi };
+ $classmeta->{cgi} ||= { $class->to_cgi } if ($r->build_form_elements && $class->can('to_cgi'));
+ $classmeta->{stringify_column} ||= $class->stringify_column if ($class->can('stringify_column'));
# User-friendliness facility for custom template writers.
if ( @{ $r->objects || [] } > 1 ) {
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;
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>
-
-This template was not found while processing the following request:
+A template was not found while processing the following request:
-<B>@{[$r->{action}]}</B> on table <B>@{[ $r->{table} ]}</B> with objects:
+<strong>@{[$r->{action}]}</strong> on table
+<strong>@{[ $r->{table} ]}</strong> 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;
}