web commit by http://dmarti.myopenid.com/

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index b6fca66ffe0f8655486abc414a9e3b952c5667aa..61e9214e62a70dff8f86f58dfd26e2b2ffe0306f 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -7,6 +7,8 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
+       hook(type => "getopt", id => "hyperestraier",
+               call => \&getopt);
        hook(type => "checkconfig", id => "hyperestraier",
                call => \&checkconfig);
        hook(type => "pagetemplate", id => "hyperestraier",
@@ -19,10 +21,17 @@ sub import { #{{{
                call => \&cgi);
 } # }}}
 
+sub getopt () { #{{{
+        eval q{use Getopt::Long};
+       error($@) if $@;
+        Getopt::Long::Configure('pass_through');
+        GetOptions("estseek=s" => \$config{estseek});
+} #}}}
+
 sub checkconfig () { #{{{
        foreach my $required (qw(url cgiurl)) {
                if (! length $config{$required}) {
-                       error("Must specify $required when using the search plugin\n");
+                       error(sprintf(gettext("Must specify %s when using the search plugin"), $required));
                }
        }
 } #}}}
@@ -46,16 +55,18 @@ sub pagetemplate (@) { #{{{
 } #}}}
 
 sub delete (@) { #{{{
-       debug("cleaning hyperestraier search index");
+       debug(gettext("cleaning hyperestraier search index"));
        estcmd("purge -cl");
        estcfg();
 } #}}}
 
 sub change (@) { #{{{
-       debug("updating hyperestraier search index");
+       debug(gettext("updating hyperestraier search index"));
        estcmd("gather -cm -bc -cl -sd",
                map {
-                       Encode::encode_utf8($config{destdir}."/".$renderedfiles{pagename($_)})
+                       map {
+                               Encode::encode_utf8($config{destdir}."/".$_)
+                       } @{$renderedfiles{pagename($_)}};
                } @_
        );
        estcfg();
@@ -64,7 +75,7 @@ sub change (@) { #{{{
 sub cgi ($) { #{{{
        my $cgi=shift;
 
-       if (defined $cgi->param('phrase')) {
+       if (defined $cgi->param('phrase') || defined $cgi->param("navi")) {
                # only works for GET requests
                chdir("$config{wikistatedir}/hyperestraier") || error("chdir: $!");
                exec("./".IkiWiki::basename($config{cgiurl})) || error("estseek.cgi failed");
@@ -79,27 +90,37 @@ sub estcfg () { #{{{
        my $estdir="$config{wikistatedir}/hyperestraier";
        my $cgi=IkiWiki::basename($config{cgiurl});
        $cgi=~s/\..*$//;
-       open(TEMPLATE, ">$estdir/$cgi.tmpl") ||
-               error("write $estdir/$cgi.tmpl: $!");
+
+       my $newfile="$estdir/$cgi.tmpl.new";
+       my $cleanup = sub { unlink($newfile) };
+       open(TEMPLATE, ">:utf8", $newfile) || error("open $newfile: $!", $cleanup);
        print TEMPLATE IkiWiki::misctemplate("search", 
-               "<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n");
-       close TEMPLATE;
-       open(TEMPLATE, ">$estdir/$cgi.conf") ||
-               error("write $estdir/$cgi.conf: $!");
+               "<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n",
+               baseurl => IkiWiki::dirname($config{cgiurl})."/") ||
+                       error("write $newfile: $!", $cleanup);
+       close TEMPLATE || error("save $newfile: $!", $cleanup);
+       rename($newfile, "$estdir/$cgi.tmpl") ||
+               error("rename $newfile: $!", $cleanup);
+       
+       $newfile="$estdir/$cgi.conf";
+       open(TEMPLATE, ">$newfile") || error("open $newfile: $!", $cleanup);
        my $template=template("estseek.conf");
        eval q{use Cwd 'abs_path'};
        $template->param(
                index => $estdir,
                tmplfile => "$estdir/$cgi.tmpl",
-               destdir => IkiWiki::abs_path($config{destdir}),
+               destdir => abs_path($config{destdir}),
                url => $config{url},
        );
-       print TEMPLATE $template->output;
-       close TEMPLATE;
+       print TEMPLATE $template->output || error("write $newfile: $!", $cleanup);
+       close TEMPLATE || error("save $newfile: $!", $cleanup);
+       rename($newfile, "$estdir/$cgi.conf") ||
+               error("rename $newfile: $!", $cleanup);
+
        $cgi="$estdir/".IkiWiki::basename($config{cgiurl});
        unlink($cgi);
-       symlink("/usr/lib/estraier/estseek.cgi", $cgi) ||
-               error("symlink $cgi: $!");
+       my $estseek = defined $config{estseek} ? $config{estseek} : '/usr/lib/estraier/estseek.cgi';
+       symlink($estseek, $cgi) || error("symlink $estseek $cgi: $!");
 } # }}}
 
 sub estcmd ($;@) { #{{{
@@ -115,7 +136,7 @@ sub estcmd ($;@) { #{{{
                foreach (@_) {
                        print CHILD "$_\n";
                }
-               close(CHILD) || error("estcmd @params exited nonzero: $?");
+               close(CHILD) || print STDERR "estcmd @params exited nonzero: $?\n";
        }
        else {
                # child