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

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index a86b153..6848bcf 100644
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -1,57 +1,35 @@
 package Gruntmaster::Page::Log;
 
-use 5.014000;
-use strict;
-use warnings;
-use parent qw/Exporter/;
-our @EXPORT_OK = qw/generate/;
-our $VERSION = '0.001';
+use Gruntmaster::Page::Base log => 'Job log';
 
-use constant TITLE => 'Job log';
 use constant PAGE_SIZE => 10;
 
-use HTML::Template::Compiled;
-use POSIX qw/strftime/;
-use Gruntmaster::Page::Common qw/header footer/;
-use Gruntmaster::Data qw/job_date job_file job_name job_private job_problem job_result job_result_text job_user/;
+sub _generate{
+	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;
 
-my %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="<tmpl_var id>"><tmpl_var id></a>
-<td><a href="/pb/<tmpl_var problem>"><tmpl_var name></a>
-<td><tmpl_var date>
-<td><tmpl_var size></a>
-<td><tmpl_var user><td class="r<tmpl_var result>"><tmpl_var result_text>
-</tmpl_loop>
-</table>
-HTML
-);
+	my $pages = POSIX::floor (jobcard / PAGE_SIZE);
+	$pages ||= 1;
+	$page ||= $pages;
 
-$templates{$_}  = header($_, TITLE) . $templates{$_} for keys %templates;
-$templates{$_} .= footer $_ for keys %templates;
-
-sub generate{
-	$_[0] =~ m,^(?:ct/([^/]+)/)?log/(\w+)\.html$,;
-	local $Gruntmaster::Data::contest = $1;
-	my $page = $2 eq 'index' ? 0 : $2;
-
-	my $htc = HTML::Template::Compiled->new(scalarref => \$templates{$_[1]});
 	my @log = sort { $b->{id} <=> $a->{id} } map +{
 		id => $_,
 		(job_private() ? (private => job_private) : ()),
 		date => (job_date() ? strftime ('%c' => localtime job_date) : '?'),
-		name => job_name,
+		extension => job_extension,
+		name => problem_name job_problem,
 		problem => job_problem,
 		result => job_result,
 		result_text => job_result_text,
-		size => sprintf ("%.2f KiB", (length job_file) / 1024),
-		user => job_user}, ($page - 1) * PAGE_SIZE + 1 .. $page * PAGE_SIZE;
+		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->output
+	$htc->param(next => $page + 1) unless $page == $pages;
+	$htc->param(prev => $page - 1) unless $page == 1;
 }
 
+sub max_age { 5 }
+
 1