oops..

[ikiwiki.git] / IkiWiki / Plugin / search.pm

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c79d4046954535ce340169cf9169b89c1e75ba6a..75004b2018fef4520b3cd4c2a2a02017cd83719e 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -7,26 +7,27 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
-       IkiWiki::hook(type => "checkconfig", id => "hyperestraier",
+       hook(type => "checkconfig", id => "hyperestraier",
                call => \&checkconfig);
-       IkiWiki::hook(type => "pagetemplate", id => "hyperestraier",
+       hook(type => "pagetemplate", id => "hyperestraier",
                call => \&pagetemplate);
-       IkiWiki::hook(type => "delete", id => "hyperestraier",
+       hook(type => "delete", id => "hyperestraier",
                call => \&delete);
-       IkiWiki::hook(type => "change", id => "hyperestraier",
+       hook(type => "change", id => "hyperestraier",
                call => \&change);
-       IkiWiki::hook(type => "cgi", id => "hyperestraier",
+       hook(type => "cgi", id => "hyperestraier",
                call => \&cgi);
 } # }}}
 
 sub checkconfig () { #{{{
        foreach my $required (qw(url cgiurl)) {
-               if (! length $IkiWiki::config{$required}) {
-                       IkiWiki::error("Must specify $required when using the search plugin\n");
+               if (! length $config{$required}) {
+                       error("Must specify $required when using the search plugin\n");
                }
        }
 } #}}}
 
+my $form;
 sub pagetemplate (@) { #{{{
        my %params=@_;
        my $page=$params{page};
@@ -34,32 +35,30 @@ sub pagetemplate (@) { #{{{
 
        # Add search box to page header.
        if ($template->query(name => "searchform")) {
-               $template->param(searchform => qq{
-<form method="get" action="$IkiWiki::config{cgiurl}" id="searchform">
-<div>
-<input type="text" name="phrase" value="" size="16" />
-<input type="hidden" name="enc" value="UTF-8" />
-<input type="hidden" name="do" value="hyperestraier" />
-</div>
-</form>
-});
+               if (! defined $form) {
+                       my $searchform = template("searchform.tmpl", blind_cache => 1);
+                       $searchform->param(searchaction => $config{cgiurl});
+                       $form=$searchform->output;
+               }
+
+               $template->param(searchform => $form);
        }
 } #}}}
 
 sub delete (@) { #{{{
-       IkiWiki::debug("cleaning hyperestraier search index");
-       IkiWiki::estcmd("purge -cl");
-       IkiWiki::estcfg();
+       debug("cleaning hyperestraier search index");
+       estcmd("purge -cl");
+       estcfg();
 } #}}}
 
 sub change (@) { #{{{
-       IkiWiki::debug("updating hyperestraier search index");
-       IkiWiki::estcmd("gather -cm -bc -cl -sd",
+       debug("updating hyperestraier search index");
+       estcmd("gather -cm -bc -cl -sd",
                map {
-                       $IkiWiki::config{destdir}."/".$IkiWiki::renderedfiles{IkiWiki::pagename($_)}
+                       Encode::encode_utf8($config{destdir}."/".$renderedfiles{pagename($_)})
                } @_
        );
-       IkiWiki::estcfg();
+       estcfg();
 } #}}}
 
 sub cgi ($) { #{{{
@@ -67,25 +66,22 @@ sub cgi ($) { #{{{
 
        if (defined $cgi->param('phrase')) {
                # only works for GET requests
-               chdir("$IkiWiki::config{wikistatedir}/hyperestraier") || IkiWiki::error("chdir: $!");
-               exec("./".IkiWiki::basename($IkiWiki::config{cgiurl})) || IkiWiki::error("estseek.cgi failed");
+               chdir("$config{wikistatedir}/hyperestraier") || error("chdir: $!");
+               exec("./".IkiWiki::basename($config{cgiurl})) || error("estseek.cgi failed");
        }
 } #}}}
 
-# Easier to keep these in the IkiWiki namespace.
-package IkiWiki;
-
 my $configured=0;
 sub estcfg () { #{{{
        return if $configured;
        $configured=1;
        
        my $estdir="$config{wikistatedir}/hyperestraier";
-       my $cgi=basename($config{cgiurl});
+       my $cgi=IkiWiki::basename($config{cgiurl});
        $cgi=~s/\..*$//;
        open(TEMPLATE, ">$estdir/$cgi.tmpl") ||
                error("write $estdir/$cgi.tmpl: $!");
-       print TEMPLATE misctemplate("search", 
+       print TEMPLATE IkiWiki::misctemplate("search", 
                "<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n");
        close TEMPLATE;
        open(TEMPLATE, ">$estdir/$cgi.conf") ||
@@ -100,7 +96,7 @@ sub estcfg () { #{{{
        );
        print TEMPLATE $template->output;
        close TEMPLATE;
-       $cgi="$estdir/".basename($config{cgiurl});
+       $cgi="$estdir/".IkiWiki::basename($config{cgiurl});
        unlink($cgi);
        symlink("/usr/lib/estraier/estseek.cgi", $cgi) ||
                error("symlink $cgi: $!");