X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FLog.pm;h=6848bcfc8dbf141f7e8f97c4d2483f928fffe89c;hb=99f0c4ecf3eecfff5752cfb1e137fbe4aeb8722d;hp=fce36cbe8fe1a4f5d91b3082c528a9cb18060bcb;hpb=bb95f538bf263c0294d87cfb90d58c66117b9aab;p=gruntmaster-page.git

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index fce36cb..6848bcf 100644
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -1,41 +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 FORMAT_EXTENSION => {
-  CPP => 'cpp',
-};
-
-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>"><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></a>
-<td><tmpl_var user><td class="r<tmpl_var result>"><tmpl_var result_text>
-</tmpl_loop>
-</table>
-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;
-	my $pages = jobcard / PAGE_SIZE;
-	my $page = $2 eq 'index' ? $pages : $2;
+	my $pages = POSIX::floor (jobcard / PAGE_SIZE);
+	$pages ||= 1;
+	$page ||= $pages;
 
 	my @log = sort { $b->{id} <=> $a->{id} } map +{
 		id => $_,
@@ -47,8 +23,13 @@ sub _generate{
 		result => job_result,
 		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 => 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