Fix incorrect usage of $Gruntmaster::Data::contest

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

diff --git a/lib/Gruntmaster/Page/Log/Entry.pm b/lib/Gruntmaster/Page/Log/Entry.pm
index e20c891307960a6fc5c1fd71679ef370c04134fc..8864df81fb0afcbada3d3aef902f719309e7ffdf 100644 (file)
--- a/lib/Gruntmaster/Page/Log/Entry.pm
+++ b/lib/Gruntmaster/Page/Log/Entry.pm
@@ -9,6 +9,10 @@ our $VERSION = '0.001';
 
 use constant TEMPLATES => {
        en => <<'HTML',
+Compiler output:
+<pre><tmpl_var errors></pre>
+
+Results:
 <table border>
 <thead>
 <tr><th>Test number<th>Result<th>Time
@@ -20,19 +24,22 @@ HTML
 };
 
 sub _generate{
-       my ($self, $htc, $path, $lang) = @_;
+       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;
 
-       $path =~ m,^(?:ct/([^/]+)/)?log/job/([^/]+)\.html$,;
-       local $Gruntmaster::Data::contest = $1;
-       my $id = $2;
+       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->param(errors => job_errors $id)
 }
 
 1