Heeere's Plack/PSGI!

[gruntmaster-page.git] / lib / Gruntmaster / Page / Log / Entry.pm

diff --git a/lib/Gruntmaster/Page/Log/Entry.pm b/lib/Gruntmaster/Page/Log/Entry.pm
index 8fed9a19fb6aa3b28730a900c07d088ef511eb19..beceae7e2f1cf01dc4807570f8fb97c4ce46ab58 100644 (file)
--- 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,25 @@ my %orig_templates = (
 </tmpl_loop>
 </table>
 HTML
-);
-
-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;
+sub _generate{
+       my ($self, $htc, $lang, $logger, $ct, $id) = @_;
+       debug $logger => "language is $lang, contest is $ct and id is $id";
+       local $Gruntmaster::Data::contest = $ct;
 
-       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