X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/20eacc2c1f74d0ab617dca36378a35920e313a23..459737780bcec043b530ccc74897c3e60dc2d967:/IkiWiki/Plugin/search.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index 8931e3fd4..da818e5cf 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -4,91 +4,106 @@ package IkiWiki::Plugin::search; use warnings; use strict; -use IkiWiki; +use IkiWiki 2.00; sub import { #{{{ - IkiWiki::hook(type => "checkconfig", id => "hyperestraier", + hook(type => "getopt", id => "hyperestraier", + call => \&getopt); + 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 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 $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)); } } } #}}} -sub pagetemplate ($$) { #{{{ - my $page=shift; - my $template=shift; +my $form; +sub pagetemplate (@) { #{{{ + my %params=@_; + my $page=$params{page}; + my $template=$params{template}; # Add search box to page header. if ($template->query(name => "searchform")) { - $template->param(searchform => qq{ -
-}); + 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(gettext("cleaning hyperestraier search index")); + estcmd("purge -cl"); + estcfg(); } #}}} 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 { - $IkiWiki::config{destdir}."/".$IkiWiki::renderedfiles{IkiWiki::pagename($_)} + map { + Encode::encode_utf8($config{destdir}."/".$_) + } @{$renderedfiles{pagename($_)}}; } @_ ); - IkiWiki::estcfg(); + estcfg(); } #}}} 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("$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", - "\n\n\n\n\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", + "\n\n\n\n\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( @@ -97,12 +112,15 @@ sub estcfg () { #{{{ 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); - 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 ($;@) { #{{{ @@ -118,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