Fix previous commit

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

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index 2379e804815c816f81cae63081b441bee514569a..6848bcfc8dbf141f7e8f97c4d2483f928fffe89c 100644 (file)
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -1,40 +1,17 @@
 package Gruntmaster::Page::Log;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base log => 'Job log';
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
 
 use constant PAGE_SIZE => 10;
 
-use constant TEMPLATES => {
-       en => <<'HTML',
-<table border>
-<thead>
-<tr><th>ID<th>Problem<th>Date<th>Size<th>User<th>Result
-<tbody>
-<tmpl_loop log><tr><td><a href="job/<tmpl_var id>.var"><tmpl_var id></a>
-<td><a href="/pb/<tmpl_var problem>.var"><tmpl_var name></a>
-<td><tmpl_var date>
-<td><a href="src/<tmpl_var id>.<tmpl_var extension>"<tmpl_if private> data-private</tmpl_if>><tmpl_var size></a>
-<td><tmpl_var user><td class="r<tmpl_var result>"><tmpl_var result_text>
-</tmpl_loop>
-</table>
-
-<tmpl_if prev><a href="<tmpl_var prev>.var">Prev page</a></tmpl_if>
-<tmpl_if next><a href="<tmpl_var next>.var">Next page</a></tmpl_if>
-HTML
-};
-
 sub _generate{
-       my ($self, $htc, $path, $lang) = @_;
+       my ($self, $htc, $lang, $env, $ct, $page) = @_;
+       debug $env => "language is '$lang', contest is '$ct' and page is '$page'";
+       local $Gruntmaster::Data::contest = $ct if $ct;
 
-       $path =~ m,^(?:ct/([^/]+)/)?log/(\w+)\.html$,;
-       local $Gruntmaster::Data::contest = $1 if $1;
        my $pages = POSIX::floor (jobcard / PAGE_SIZE);
-       my $page = $2 eq 'index' ? $pages : $2;
+       $pages ||= 1;
+       $page ||= $pages;
 
        my @log = sort { $b->{id} <=> $a->{id} } map +{
                id => $_,
@@ -47,9 +24,12 @@ sub _generate{
                result_text => job_result_text,
                size => sprintf ("%.2f KiB", job_filesize() / 1024),
                user => job_user}, ($page - 1) * PAGE_SIZE + 1 .. ($page == $pages ? jobcard : $page * PAGE_SIZE);
+       $_->{user_name} = do { local $Gruntmaster::Data::contest; user_name $_->{user} } for @log;
        $htc->param(log => \@log);
        $htc->param(next => $page + 1) unless $page == $pages;
        $htc->param(prev => $page - 1) unless $page == 1;
 }
 
+sub max_age { 5 }
+
 1