X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FLog%2FEntry.pm;h=e849876d2a67a32f9abe138457c63d4242e652a8;hb=5bbf0128012c09c78462ee49b874f968385b0978;hp=08230bfaf8fa475895960943e58a5aa5dd98e340;hpb=42546e6c1b709dc4c8d8e7048becc14278b6cdf0;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page/Log/Entry.pm b/lib/Gruntmaster/Page/Log/Entry.pm
index 08230bf..e849876 100644
--- a/lib/Gruntmaster/Page/Log/Entry.pm
+++ b/lib/Gruntmaster/Page/Log/Entry.pm
@@ -14,7 +14,7 @@ use HTML::Template::Compiled;
 use IO::File;
 use POSIX qw/strftime/;
 use YAML::Any qw/LoadFile/;
-use Gruntmaster::Page qw/header footer/;
+use Gruntmaster::Page::Common qw/header footer/;
 
 my %templates = (
   en => <<'HTML',
@@ -33,19 +33,20 @@ $templates{$_} .= footer $_ for keys %templates;
 
 sub generate{
   my ($path, $lang) = @_;
-  $path = ($path =~ m,log/(.*)/index,)[0];
+  my $id = ($path =~ m,log/(.*)/index,)[0];
+  $path =~ s,/index\.html,,;
   my $template = $templates{$lang};
 
   my $htc = HTML::Template::Compiled->new(scalarref => \$template);
-  flock my $metafh = IO::File->new("<log/$path/meta.yml"), LOCK_SH;
-  my $meta = LoadFile "log/$path/meta.yml";
+  flock my $metafh = IO::File->new("<$path/meta.yml"), LOCK_SH;
+  my $meta = LoadFile "$path/meta.yml";
 
   my @tests = map {
 	$_->{time} = sprintf "%.4fs", $_->{time};
 	$_
   } @{$meta->{results}};
 
-  $htc->param(id => $path);
+  $htc->param(id => $id);
   $htc->param(tests => \@tests);
   $htc->output
 }