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

Probably only the search plugin uses it, so this seemed safe.

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 9e875c79cc6008e4a5bca4d294a659e2fac21acd..b1f4747fea804e1d9c5a5796058f844aa9d1ba00 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -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 => "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);
 }
        hook(type => "delete", id => "search", call => \&delete);
        hook(type => "cgi", id => "search", call => \&cgi);
 }

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index a404e24af074ad3be5b75f7b9b2c0cf5e4bf7393..34713c73bfd8c729fd09523edbaedf0c560d0735 100644 (file)
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -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 => "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);
        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};
 }
 
        return $params{content};
 }
 

-sub postscan (@) {
+sub indexhtml (@) {

        my %params=@_;
        
        my %params=@_;
        

-       debug("skeleton plugin running as postscan");
+       debug("skeleton plugin running as indexhtml");

 }
 
 sub format (@) {
 }
 
 sub format (@) {

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e5ba0079b7b74706ebc1723a9206de3de3770ba1..30e3d4199cd56b26cbf69529ca8d641d1d6ac7b2 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -62,7 +62,7 @@ sub genpage ($$) {
        my $page=shift;
        my $content=shift;
        
        my $page=shift;
        my $content=shift;
        

-       run_hooks(postscan => sub {
+       run_hooks(indexhtml => sub {

                shift->(page => $page, content => $content);
        });
 
                shift->(page => $page, content => $content);
        });
 

diff --git a/debian/changelog b/debian/changelog
index 77fd13826bf5feb9924a8d05454087c255e8fd97..eb67c2bde2b71c60e8df658abca5eb13cfc42f78 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 

diff --git a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
index be14e5126eae8d2d67168741222b6c525bddd5c4..c6e3cd4fd3326c09c08e629ab795318e7cb1a67f 100644 (file)
--- a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
+++ b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
@@ -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
   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
   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

diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn
index ab822e76cca14c6bfd066bdb386791aa16c40285..27683f1eae22ddce2fca8c01155fee976f35c273 100644 (file)
--- a/doc/plugins/po/discussion.mdwn
+++ b/doc/plugins/po/discussion.mdwn
@@ -513,7 +513,7 @@ finish it at some point in the first quarter of 2009. --[[intrigeri]]
 >>>>
 >>>>> Done. --[[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
 >   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

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 3b1d770ebcd951004866c9cb1002088fa2eb6ab8..7180237a41112a059c6a60e105d9801c886d0afe 100644 (file)
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -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
 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,
 `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.
 
 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
 
 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