X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FLog%2FEntry.pm;h=57591b5da3837d2bb3c8bfcd3e5fec057e9f051a;hb=cb98abf4bd74c0f9646d264afb297505eb85f611;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..57591b5 100644
--- a/lib/Gruntmaster/Page/Log/Entry.pm
+++ b/lib/Gruntmaster/Page/Log/Entry.pm
@@ -3,45 +3,27 @@ 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/;
+sub _generate{
+	my ($self, $htc, $lang, $env, $ct, $id) = @_;
+	debug $env => "language is '$lang', contest is '$ct' and id is '$id'";
+	local $Gruntmaster::Data::contest = $ct if $ct;
 
-my %orig_templates = (
-	en => <<'HTML',
-<table border>
-<thead>
-<tr><th>Test number<th>Result<th>Time
-<tbody>
-<tmpl_loop tests><tr><td><tmpl_var id><td class="r<tmpl_var result>"><tmpl_var result_text><td><tmpl_var time>
-</tmpl_loop>
-</table>
-HTML
-);
+	my @tests = ();
 
-my %templates = cook_templates %orig_templates, log_entry => 'Job <tmpl_var id>';
-
-sub generate{
-	%templates = cook_templates %orig_templates, log_entry => 'Job <tmpl_var id>' if reload_templates;
-	$_[0] =~ m,^(?:ct/([^/]+)/)?log/job/([^/]+)\.html$,;
-	local $Gruntmaster::Data::contest = $1;
-	my $id = $2;
-
-	my $htc = HTML::Template::Compiled->new(scalarref => \$templates{$_[1]});
-
-	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