X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/9875bc10d14d50f543f4aab3ce4e9dae060b8c23..890863679fea395172c247877579d391563c3b5e:/IkiWiki/Render.pm diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 4495b9cfd..302b18395 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -85,12 +85,6 @@ sub genpage ($$) { #{{{ $actions++; } - if ($config{rcs} && exists $config{recentchangespage} && - $page ne $config{recentchangespage}) { - $template->param(recentchangesurl => urlto($config{recentchangespage}, $page)); - $actions++; - } - if (length $config{historyurl}) { my $u=$config{historyurl}; $u=~s/\[\[file\]\]/$pagesources{$page}/g; @@ -132,6 +126,7 @@ sub genpage ($$) { #{{{ backlinks => $backlinks, more_backlinks => $more_backlinks, mtime => displaytime($pagemtime{$page}), + ctime => displaytime($pagectime{$page}), baseurl => baseurl($page), ); @@ -170,18 +165,23 @@ sub scan ($) { #{{{ # Always needs to be done, since filters might add links # to the content. $content=filter($page, $page, $content); - - my @links; - while ($content =~ /(? sub { + shift->( + page => $page, + content => $content, + ); + }); + # Preprocess in scan-only mode. preprocess($page, $page, $content, 1); } @@ -209,7 +209,6 @@ sub render ($) { #{{{ my $output=htmlpage($page); writefile($output, $config{destdir}, genpage($page, $content)); - utime($pagemtime{$page}, $pagemtime{$page}, $config{destdir}."/".$output); } else { my $srcfd=readfile($srcfile, 1, 1); @@ -235,7 +234,6 @@ sub render ($) { #{{{ } } }); - utime($pagemtime{$file}, $pagemtime{$file}, $config{destdir}."/".$file); } } #}}} @@ -332,12 +330,18 @@ sub refresh () { #{{{ } else { push @add, $file; + if ($config{getctime} && -e "$config{srcdir}/$file") { + eval { + my $time=rcs_getctime("$config{srcdir}/$file"); + $pagectime{$page}=$time; + }; + if ($@) { + print STDERR $@; + } + } } $pagecase{lc $page}=$page; - if ($config{getctime} && -e "$config{srcdir}/$file") { - $pagectime{$page}=rcs_getctime("$config{srcdir}/$file"); - } - elsif (! exists $pagectime{$page}) { + if (! exists $pagectime{$page}) { $pagectime{$page}=mtime(srcfile($file)); } } @@ -377,6 +381,8 @@ sub refresh () { #{{{ $pagemtime{$page}=$mtime; if (isinternal($page)) { push @internal, $file; + # Preprocess internal page in scan-only mode. + preprocess($page, $page, readfile(srcfile($file)), 1); } else { push @needsbuild, $file;