search: Update search page when page.tmpl or searchquery.tmpl are locally modified.

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 3f0b7c9ad4c657db023be5e489f069768dc8201a..ab7c0eebb89be17b478a1be29bd31641ee7d0786 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -14,6 +14,7 @@ sub import {
        hook(type => "delete", id => "search", call => \&delete);
        hook(type => "cgi", id => "search", call => \&cgi);
        hook(type => "disable", id => "search", call => \&disable);
+       hook(type => "needsbuild", id => "search", call => \&needsbuild);
 }
 
 sub getsetup () {
@@ -226,27 +227,39 @@ sub setupfiles () {
                writefile("omega.conf", $config{wikistatedir}."/xapian",
                        "database_dir .\n".
                        "template_dir ./templates\n");
-               
-               # Avoid omega interpreting anything in the cgitemplate
-               # as an omegascript command.
-               eval q{use IkiWiki::CGI};
-               my $template=IkiWiki::cgitemplate(undef, gettext("search"), "\0",
-                       searchform => "", # avoid showing the small search form
-               );
-               eval q{use HTML::Entities};
-               error $@ if $@;
-               $template=encode_entities($template, '\$');
-
-               my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl"));
-               $template=~s/\0/$querytemplate/;
-
-               writefile("query", $config{wikistatedir}."/xapian/templates",
-                       $template);
+               omega_template();       
                $setup=1;
        }
 }
 }
 
+sub needsbuild {
+       my $list=shift;
+       if (grep {
+               $_ eq "templates/page.tmpl" ||
+               $_ eq "templates/searchquery.tmpl"
+       } @$list) {
+               omega_template();
+       }
+}
+
+sub omega_template {
+       # Avoid omega interpreting anything in the cgitemplate
+       # as an omegascript command.
+       eval q{use IkiWiki::CGI};
+       my $template=IkiWiki::cgitemplate(undef, gettext("search"), "\0",
+               searchform => "", # avoid showing the small search form
+       );
+       eval q{use HTML::Entities};
+       error $@ if $@;
+       $template=encode_entities($template, '\$');
+
+       my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl"));
+       $template=~s/\0/$querytemplate/;
+       writefile("query", $config{wikistatedir}."/xapian/templates",
+               $template);
+}
+
 sub disable () {
        if (-d $config{wikistatedir}."/xapian") {
                system("rm", "-rf", $config{wikistatedir}."/xapian");

diff --git a/debian/changelog b/debian/changelog
index 95435f3dd8df4ff9a2921616cb8f45cda03d1dcc..cf3539f1daa36f9ec50db4214a606870698fd08b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20110432) UNRELEASED; urgency=low
+
+  * search: Update search page when page.tmpl or searchquery.tmpl are locally
+    modified.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 03 Jun 2011 20:30:35 -0400
+
 ikiwiki (3.20110431) unstable; urgency=low
 
   * Danish translation update. Closes: #625721

diff --git a/doc/bugs/search_template_missing_dep.mdwn b/doc/bugs/search_template_missing_dep.mdwn
index 1bedf2a3f2fb22318d15b6b81df9bc8cb62f8a7a..eebc5926ec319d2bd2f36a05c34f561e43cfb946 100644 (file)
--- a/doc/bugs/search_template_missing_dep.mdwn
+++ b/doc/bugs/search_template_missing_dep.mdwn
@@ -1,4 +1,4 @@
 The [[plugins/search]] plugin caches a filled in version of `page.tmpl` for
 omega. This is updated only if missing or on rebuild, so if the template is
 modified otherwise and normal refresh allowed to update the rest of the
-site, this gets missed and a stale template is used. --[[Joey]] 
+site, this gets missed and a stale template is used. --[[Joey]] [[done]]