X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FLog%2FEntry.pm;h=2c4aa3acb5cfc1bec533ddf6e673a08e5c80e642;hb=7f0f55d8d78f78bdc76d6ac3089c6aa085d95be6;hp=8fed9a19fb6aa3b28730a900c07d088ef511eb19;hpb=2b0036ac8e077cc20cf9db6ff8dad4091ab50cb3;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page/Log/Entry.pm b/lib/Gruntmaster/Page/Log/Entry.pm
index 8fed9a1..2c4aa3a 100644
--- a/lib/Gruntmaster/Page/Log/Entry.pm
+++ b/lib/Gruntmaster/Page/Log/Entry.pm
@@ -3,17 +3,16 @@ package Gruntmaster::Page::Log::Entry;
 use 5.014000;
 use strict;
 use warnings;
-use parent qw/Exporter/;
-our @EXPORT_OK = qw/generate/;
+use Gruntmaster::Page::Base log_entry => 'Job <tmpl_var id>';
+our @ISA = qw/Gruntmaster::Page::Base/;
 our $VERSION = '0.001';
 
-use HTML::Template::Compiled;
-use POSIX qw/strftime/;
-use Gruntmaster::Page::Common qw/cook_templates reload_templates/;
-use Gruntmaster::Data qw/job_results/;
-
-my %orig_templates = (
+use constant TEMPLATES => {
 	en => <<'HTML',
+Compiler output:
+<pre><tmpl_var errors></pre>
+
+Results:
 <table border>
 <thead>
 <tr><th>Test number<th>Result<th>Time
@@ -22,26 +21,27 @@ my %orig_templates = (
 </tmpl_loop>
 </table>
 HTML
-);
+};
 
-my %templates = cook_templates %orig_templates, log_entry => 'Job <tmpl_var id>';
+sub _generate{
+	my ($self, $htc, $path, $lang) = @_;
 
-sub generate{
-	%templates = cook_templates %orig_templates, log_entry => 'Job <tmpl_var id>' if reload_templates;
-	$_[0] =~ m,^(?:ct/([^/]+)/)?log/job/([^/]+)\.html$,;
+	$path =~ m,^(?:ct/([^/]+)/)?log/job/([^/]+)\.html$,;
 	local $Gruntmaster::Data::contest = $1;
 	my $id = $2;
 
-	my $htc = HTML::Template::Compiled->new(scalarref => \$templates{$_[1]});
+	my @tests = ();
 
-	my @tests = map {
-		$_->{time} = sprintf "%.4fs", $_->{time};
-		$_
-	} @{job_results $id};
+	eval {
+		@tests = map {
+			$_->{time} = sprintf "%.4fs", $_->{time};
+			$_
+		} @{job_results $id};
+	};
 
 	$htc->param(id => $id);
 	$htc->param(tests => \@tests);
-	$htc->output
+	$htc->param(errors => job_errors $id)
 }
 
 1