rename

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index b6fca66ffe0f8655486abc414a9e3b952c5667aa..3cfc301e2e7815c4ff36f181fa38d01f319afb58 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -7,6 +7,8 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
 use IkiWiki;
 
 sub import { #{{{

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

        hook(type => "checkconfig", id => "hyperestraier",
                call => \&checkconfig);
        hook(type => "pagetemplate", id => "hyperestraier",
        hook(type => "checkconfig", id => "hyperestraier",
                call => \&checkconfig);
        hook(type => "pagetemplate", id => "hyperestraier",


@@ -19,6 +21,13 @@ sub import { #{{{
                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)) {
                if (! length $config{$required}) {
 sub checkconfig () { #{{{
        foreach my $required (qw(url cgiurl)) {
                if (! length $config{$required}) {


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

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

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


@@ -79,10 +89,11 @@ 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, ">$estdir/$cgi.tmpl") ||
+       open(TEMPLATE, ">:utf8", "$estdir/$cgi.tmpl") ||

                error("write $estdir/$cgi.tmpl: $!");
        print TEMPLATE IkiWiki::misctemplate("search", 
                error("write $estdir/$cgi.tmpl: $!");
        print TEMPLATE IkiWiki::misctemplate("search", 

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


@@ -91,15 +102,16 @@ sub estcfg () { #{{{
        $template->param(
                index => $estdir,
                tmplfile => "$estdir/$cgi.tmpl",
        $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;
        $cgi="$estdir/".IkiWiki::basename($config{cgiurl});
        unlink($cgi);
                url => $config{url},
        );
        print TEMPLATE $template->output;
        close TEMPLATE;
        $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 ($;@) { #{{{
 } # }}}
 
 sub estcmd ($;@) { #{{{