$file=~/\.(png|gif|jpg|jpeg)$/;
}
-sub htmllink ($$) {
+sub htmllink {
my $page=shift;
my $link=shift;
+ my $noimagelink=shift;
my $bestlink=bestlink($page, $link);
$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
- if (isinlinableimage($bestlink)) {
+ if (! $noimagelink && isinlinableimage($bestlink)) {
return "<img src=\"$bestlink\">";
}
return "<a href=\"$bestlink\">$link</a>";
sub saveindex () {
open (OUT, ">$srcdir/.index") || error("cannot write to .index: $!");
foreach my $page (keys %oldpagemtime) {
- print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ".
- join(" ", @{$links{$page}})."\n"
- if $oldpagemtime{$page};
+ print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ".
+ join(" ", @{$links{$page}})."\n"
+ if $oldpagemtime{$page};
}
close OUT;
}
my $num=shift;
my @ret;
- eval {use Date::Parse};
- eval {use Time::Duration};
+ eval q{use Date::Parse};
+ eval q{use Time::Duration};
if (-d "$srcdir/.svn") {
my $info=`LANG=C svn info $srcdir`;
my ($svn_url)=$info=~/^URL: (.*)$/m;
+ # FIXME: currently assumes that the wiki is somewhere
+ # under trunk in svn, doesn't support other layouts.
+ my ($svn_base)=$svn_url=~m!(/trunk(?:/.*)?)$!;
+
my $div=qr/^--------------------+$/;
my $infoline=qr/^r(\d+)\s+\|\s+([^\s]+)\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
my $state='start';
my ($rev, $user, $when, @pages, $message);
foreach (`LANG=C svn log -v '$svn_url'`) {
- print STDERR "state: $state\n";
chomp;
if ($state eq 'start' && /$div/) {
$state='header';
elsif ($state eq 'header' && /$infoline/) {
$rev=$1;
$user=$2;
- $when=ago(time - str2time($3));
+ $when=concise(ago(time - str2time($3)));
}
- elsif ($state eq 'header' && /^\s+(.*)/) {
- push @pages, $1;
+ elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E\/(.+)$/) {
+ push @pages, pagename($1) if length $1;
}
elsif ($state eq 'header' && /^$/) {
$state='body';
}
elsif ($state eq 'body' && /$div/) {
- push @ret, {rev => $rev, user => $user,
- date => $when, message => $message,
- pages => [@pages]},
- last if @ret >= $num;
+ push @ret, { rev => $rev, user => $user,
+ when => $when, message => $message,
+ pages => [@pages] } if @pages;
+ return @ret if @ret >= $num;
$state='header';
$message=$rev=$user=$when=undef;
sub gen_wrapper ($$) {
my ($svn, $rebuild)=@_;
- eval {use Cwd 'abs_path'};
+ eval q{use Cwd 'abs_path'};
$srcdir=abs_path($srcdir);
$destdir=abs_path($destdir);
my $this=abs_path($0);
my $list="<ul>\n";
foreach my $change (rcs_recentchanges(100)) {
$list.="<li>";
- foreach my $page (@{$change->{pages}}) {
- $list.=$page." ";
- }
+ $list.=join(", ", map { htmllink("index", $_, 1) } @{$change->{pages}});
$list.="<br>\n";
$list.="changed ".$change->{when}." by ".
- htmllink("index", $change->{user}).
- ": <i>".$change->{message}."<br>\n";
+ htmllink("index", $change->{user}, 1).
+ ": <i>".$change->{message}."</i>\n";
$list.="</li>\n";
}
$list.="</ul>\n";