* Only try postsignin if no other action matched. Fixes a bug where the

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 1b5c66716f90faaff3fd36d26d909cce5d1710d7..da818e5cfea6c2f87719d78648dfa32d779491d0 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::search;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
        hook(type => "getopt", id => "hyperestraier",
 
 sub import { #{{{
        hook(type => "getopt", id => "hyperestraier",


@@ -64,8 +64,9 @@ sub change (@) { #{{{
        debug(gettext("updating hyperestraier search index"));
        estcmd("gather -cm -bc -cl -sd",
                map {
        debug(gettext("updating hyperestraier search index"));
        estcmd("gather -cm -bc -cl -sd",
                map {

-                       Encode::encode_utf8($config{destdir}."/".$_)
-                               foreach @{$renderedfiles{pagename($_)}};
+                       map {
+                               Encode::encode_utf8($config{destdir}."/".$_)
+                       } @{$renderedfiles{pagename($_)}};

                } @_
        );
        estcfg();
                } @_
        );
        estcfg();


@@ -89,14 +90,20 @@ sub estcfg () { #{{{
        my $estdir="$config{wikistatedir}/hyperestraier";
        my $cgi=IkiWiki::basename($config{cgiurl});
        $cgi=~s/\..*$//;
        my $estdir="$config{wikistatedir}/hyperestraier";
        my $cgi=IkiWiki::basename($config{cgiurl});
        $cgi=~s/\..*$//;

-       open(TEMPLATE, ">:utf8", "$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",
        print TEMPLATE IkiWiki::misctemplate("search", 
                "<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n",

-               baseurl => IkiWiki::dirname($config{cgiurl})."/");
-       close TEMPLATE;
-       open(TEMPLATE, ">$estdir/$cgi.conf") ||
-               error("write $estdir/$cgi.conf: $!");
+               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(
        my $template=template("estseek.conf");
        eval q{use Cwd 'abs_path'};
        $template->param(


@@ -105,13 +112,15 @@ sub estcfg () { #{{{
                destdir => abs_path($config{destdir}),
                url => $config{url},
        );
                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);
        my $estseek = defined $config{estseek} ? $config{estseek} : '/usr/lib/estraier/estseek.cgi';
        $cgi="$estdir/".IkiWiki::basename($config{cgiurl});
        unlink($cgi);
        my $estseek = defined $config{estseek} ? $config{estseek} : '/usr/lib/estraier/estseek.cgi';

-       symlink($estseek, $cgi) ||
-               error("symlink $estseek $cgi: $!");
+       symlink($estseek, $cgi) || error("symlink $estseek $cgi: $!");

 } # }}}
 
 sub estcmd ($;@) { #{{{
 } # }}}
 
 sub estcmd ($;@) { #{{{


@@ -127,7 +136,7 @@ sub estcmd ($;@) { #{{{
                foreach (@_) {
                        print CHILD "$_\n";
                }
                foreach (@_) {
                        print CHILD "$_\n";
                }

-               close(CHILD) || error("estcmd @params exited nonzero: $?");
+               close(CHILD) || print STDERR "estcmd @params exited nonzero: $?\n";

        }
        else {
                # child
        }
        else {
                # child