Add log pagination, allow jo and fix bugs in log/log_entry

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

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index fce36cbe8fe1a4f5d91b3082c528a9cb18060bcb..2379e804815c816f81cae63081b441bee514569a 100644 (file)
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -9,10 +9,6 @@ our $VERSION = '0.001';
 
 use constant PAGE_SIZE => 10;
 
-use constant FORMAT_EXTENSION => {
-  CPP => 'cpp',
-};
-
 use constant TEMPLATES => {
        en => <<'HTML',
 <table border>
@@ -20,12 +16,15 @@ use constant TEMPLATES => {
 <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><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></a>
+<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
 };
 
@@ -33,8 +32,8 @@ sub _generate{
        my ($self, $htc, $path, $lang) = @_;
 
        $path =~ m,^(?:ct/([^/]+)/)?log/(\w+)\.html$,;
-       local $Gruntmaster::Data::contest = $1;
-       my $pages = jobcard / PAGE_SIZE;
+       local $Gruntmaster::Data::contest = $1 if $1;
+       my $pages = POSIX::floor (jobcard / PAGE_SIZE);
        my $page = $2 eq 'index' ? $pages : $2;
 
        my @log = sort { $b->{id} <=> $a->{id} } map +{
@@ -47,8 +46,10 @@ 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);
        $htc->param(log => \@log);
+       $htc->param(next => $page + 1) unless $page == $pages;
+       $htc->param(prev => $page - 1) unless $page == 1;
 }
 
 1