Heeere's Plack/PSGI!

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

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index c9d0dfb60834a277e9b6ff58071ce6a68d2fc64c..f46e6a9e93e836e27f38731b6424d19c73b05f57 100644 (file)
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -15,27 +15,27 @@ use constant TEMPLATES => {
 <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>
+<tmpl_loop log><tr><td><a href="job/<tmpl_var id>"><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>
 <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>
+<tmpl_if prev><a href="<tmpl_var prev>">Prev page</a></tmpl_if>
+<tmpl_if next><a href="<tmpl_var next>">Next page</a></tmpl_if>
 HTML
 };
 
 sub _generate{
-       my ($self, $htc, $path, $lang) = @_;
+       my ($self, $htc, $lang, $logger, $ct, $page) = @_;
+       debug $logger => "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);
        $pages ||= 1;
-       my $page = $2 eq 'index' ? $pages : $2;
+       $page //= $pages;
 
        my @log = sort { $b->{id} <=> $a->{id} } map +{
                id => $_,