X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FLog.pm;h=cdef1df1aa9f4fbb167bd40d6ebc10b6760e7f8a;hb=a73373457a03facd0c96632a9c19150eda3f85f3;hp=5a2b4c6a91d36cb13a846479f91f6baedb79ff05;hpb=3da9c3c228106c819530a0b8e4c646981e6f71c9;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index 5a2b4c6..cdef1df 100644
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -3,59 +3,48 @@ package Gruntmaster::Page::Log;
 use 5.014000;
 use strict;
 use warnings;
-use parent qw/Exporter/;
-our @EXPORT_OK = qw/generate/;
+use Gruntmaster::Page::Base log => 'Job log';
+our @ISA = qw/Gruntmaster::Page::Base/;
 our $VERSION = '0.001';
 
-use constant TITLE => 'Job log';
 use constant PAGE_SIZE => 10;
 
-use constant FORMAT_EXTENSION => {
-  CPP => 'cpp',
-};
-
-use HTML::Template::Compiled;
-use POSIX qw/strftime/;
-use Gruntmaster::Page::Common qw/header footer/;
-use Gruntmaster::Data qw/job_date job_file problem_name job_private job_problem job_result job_result_text job_user/;
-
-my %templates = (
+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="<tmpl_var id>"><tmpl_var id></a>
+<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 filename>"<tmpl_if private> data-private</tmpl_if>><tmpl_var size></a></a>
+<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
-);
+};
 
-$templates{$_}  = header($_, TITLE) . $templates{$_} for keys %templates;
-$templates{$_} .= footer $_ for keys %templates;
+sub _generate{
+	my ($self, $htc, $path, $lang) = @_;
 
-sub generate{
-	$_[0] =~ m,^(?:ct/([^/]+)/)?log/(\w+)\.html$,;
-	local $Gruntmaster::Data::contest = $1;
-	my $page = $2 eq 'index' ? 0 : $2;
+	$path =~ m,^(?:ct/([^/]+)/)?log/(\w+)\.html$,;
+	local $Gruntmaster::Data::contest = $1 if $1;
+	my $pages = POSIX::ceil (jobcard / PAGE_SIZE);
+	my $page = $2 eq 'index' ? $pages : $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) : '?'),
+		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);
 	$htc->param(log => \@log);
-	$htc->output
 }
 
 1