Merge branch 'master' of git://git.madduck.net/code/ikiwiki

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c8e0dd580224a7dc810208c1ac3f294633b1f5ab..9bf223cf000310463175c2cd579aaa9c603d9010 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -4,25 +4,34 @@ package IkiWiki::Plugin::search;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::hook(type => "checkconfig", id => "hyperestraier",
+       hook(type => "getopt", id => "hyperestraier",
+               call => \&getopt);
+       hook(type => "checkconfig", id => "hyperestraier",

                call => \&checkconfig);
                call => \&checkconfig);

-       IkiWiki::hook(type => "pagetemplate", id => "hyperestraier",
+       hook(type => "pagetemplate", id => "hyperestraier",

                call => \&pagetemplate);
                call => \&pagetemplate);

-       IkiWiki::hook(type => "delete", id => "hyperestraier",
+       hook(type => "delete", id => "hyperestraier",

                call => \&delete);
                call => \&delete);

-       IkiWiki::hook(type => "change", id => "hyperestraier",
+       hook(type => "change", id => "hyperestraier",

                call => \&change);
                call => \&change);

-       IkiWiki::hook(type => "cgi", id => "hyperestraier",
+       hook(type => "cgi", id => "hyperestraier",

                call => \&cgi);
 } # }}}
 
                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)) {
 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(sprintf(gettext("Must specify %s when using the search plugin"), $required));

                }
        }
 } #}}}
                }
        }
 } #}}}


@@ -36,8 +45,8 @@ sub pagetemplate (@) { #{{{
        # Add search box to page header.
        if ($template->query(name => "searchform")) {
                if (! defined $form) {
        # Add search box to page header.
        if ($template->query(name => "searchform")) {
                if (! defined $form) {

-                       my $searchform = IkiWiki::template("searchform.tmpl", blind_cache => 1);
-                       $searchform->param(searchaction => $IkiWiki::config{cgiurl});
+                       my $searchform = template("searchform.tmpl", blind_cache => 1);
+                       $searchform->param(searchaction => $config{cgiurl});

                        $form=$searchform->output;
                }
 
                        $form=$searchform->output;
                }
 


@@ -46,49 +55,55 @@ sub pagetemplate (@) { #{{{
 } #}}}
 
 sub delete (@) { #{{{
 } #}}}
 
 sub delete (@) { #{{{

-       IkiWiki::debug("cleaning hyperestraier search index");
-       IkiWiki::estcmd("purge -cl");
-       IkiWiki::estcfg();
+       debug(gettext("cleaning hyperestraier search index"));
+       estcmd("purge -cl");
+       estcfg();

 } #}}}
 
 sub change (@) { #{{{
 } #}}}
 
 sub change (@) { #{{{

-       IkiWiki::debug("updating hyperestraier search index");
-       IkiWiki::estcmd("gather -cm -bc -cl -sd",
+       debug(gettext("updating hyperestraier search index"));
+       estcmd("gather -cm -bc -cl -sd",

                map {
                map {

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

                } @_
        );
                } @_
        );

-       IkiWiki::estcfg();
+       estcfg();

 } #}}}
 
 sub cgi ($) { #{{{
        my $cgi=shift;
 
 } #}}}
 
 sub cgi ($) { #{{{
        my $cgi=shift;
 

-       if (defined $cgi->param('phrase')) {
+       if (defined $cgi->param('phrase') || defined $cgi->param("navi")) {

                # only works for GET requests
                # 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 $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/\..*$//;
        $cgi=~s/\..*$//;

-       open(TEMPLATE, ">$estdir/$cgi.tmpl") ||
-               error("write $estdir/$cgi.tmpl: $!");
-       print TEMPLATE misctemplate("search", 
-               "<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n");
-       close TEMPLATE;
-       open(TEMPLATE, ">$estdir/$cgi.conf") ||
-               error("write $estdir/$cgi.conf: $!");
+
+       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",
+               forcebaseurl => 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(


@@ -97,12 +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;
-       $cgi="$estdir/".basename($config{cgiurl});
+       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);
        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 ($;@) { #{{{
 } # }}}
 
 sub estcmd ($;@) { #{{{


@@ -118,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