Renamed postscan hook to indexhtml, to reflect its changed position.

Probably only the search plugin uses it, so this seemed safe.
master
Joey Hess 2010-05-06 23:07:08 -04:00
parent 4c320176c0
commit 121e2ffc2f
7 changed files with 12 additions and 10 deletions

View File

@ -10,7 +10,7 @@ sub import {
hook(type => "getsetup", id => "search", call => \&getsetup);
hook(type => "checkconfig", id => "search", call => \&checkconfig);
hook(type => "pagetemplate", id => "search", call => \&pagetemplate);
hook(type => "postscan", id => "search", call => \&index);
hook(type => "indexhtml", id => "search", call => \&index);
hook(type => "delete", id => "search", call => \&delete);
hook(type => "cgi", id => "search", call => \&cgi);
}

View File

@ -20,7 +20,7 @@ sub import {
hook(type => "scan", id => "skeleton", call => \&scan);
hook(type => "htmlize", id => "skeleton", call => \&htmlize);
hook(type => "sanitize", id => "skeleton", call => \&sanitize);
hook(type => "postscan", id => "skeleton", call => \&postscan);
hook(type => "indexhtml", id => "skeleton", call => \&indexhtml);
hook(type => "format", id => "skeleton", call => \&format);
hook(type => "pagetemplate", id => "skeleton", call => \&pagetemplate);
hook(type => "templatefile", id => "skeleton", call => \&templatefile);
@ -118,10 +118,10 @@ sub sanitize (@) {
return $params{content};
}
sub postscan (@) {
sub indexhtml (@) {
my %params=@_;
debug("skeleton plugin running as postscan");
debug("skeleton plugin running as indexhtml");
}
sub format (@) {

View File

@ -62,7 +62,7 @@ sub genpage ($$) {
my $page=shift;
my $content=shift;
run_hooks(postscan => sub {
run_hooks(indexhtml => sub {
shift->(page => $page, content => $content);
});

2
debian/changelog vendored
View File

@ -5,6 +5,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
* If you have a locally customised page.tmpl, it needs to be updated
to set <base> when BASEURL or FORCEBAREURL is set.
* Gave comment and page editing forms some CSS and accessability love.
* Renamed postscan hook to indexhtml, to reflect its changed position,
and typical use.
-- Joey Hess <joeyh@debian.org> Wed, 05 May 2010 18:07:29 -0400

View File

@ -144,7 +144,7 @@ So, looking at your meta branch: --[[Joey]]
has no title, then A will display the link as "B". Now page B is modified
and a title is added. Nothing updates "A".
The added overhead of rebuilding every page that links to B when B is
changed (as the `postscan` hook of the po plugin does) is IMHO a killer.
changed (as the `indexhtml` hook of the po plugin does) is IMHO a killer.
That could be hundreds or thousands of pages, making interactive editing
way slow. This is probably the main reason I had not attempted this whole
thing myself. IMHO this calls for some kind of intellegent dependency

View File

@ -513,7 +513,7 @@ finish it at some point in the first quarter of 2009. --[[intrigeri]]
>>>>
>>>>> Done. --[[intrigeri]]
>>>
> * I'm very fearful of the `add_depends` in `postscan`.
> * I'm very fearful of the `add_depends` in `indexhtml`.
> Does this make every page depend on every page that links
> to it? Won't this absurdly bloat the dependency pagespecs
> and slow everything down? And since nicepagetitle is given

View File

@ -39,7 +39,7 @@ built.
Now that it knows what pages it needs to build, ikiwiki runs two
compile passes. First, it runs `scan` hooks, which collect metadata about
the pages. Then it runs a page rendering pipeline, by calling in turn these
hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `postscan`,
hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `indexhtml`,
`pagetemplate`, `sanitize`, `format`.
After all necessary pages are built, it calls the `change` hook. Finally,
@ -282,9 +282,9 @@ like `Makefile` that have no extension.
If `hook` is passed an optional "longname" parameter, this value is used
when prompting a user to choose a page type on the edit page form.
### postscan
### indexhtml
hook(type => "postscan", id => "foo", call => \&postscan);
hook(type => "indexhtml", id => "foo", call => \&indexhtml);
This hook is called once the page has been converted to html (but before
the generated html is put in a template). The most common use is to