X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5466a1daf99e8e4c67a19f871aaf558312569652..24359d670d8572630f5a447b8f46e955c1fb3fa4:/IkiWiki/Plugin/search.pm

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c94974ac4..c8e0dd580 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -27,20 +27,22 @@ sub checkconfig () { #{{{
 	}
 } #}}}
 
-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.
-	$template->param(searchform => qq{
-<form method="get" action="$IkiWiki::config{cgiurl}" id="searchform">
-<div>
-<input type="text" name="phrase" value="" size="16" />
-<input type="hidden" name="enc" value="UTF-8" />
-<input type="hidden" name="do" value="hyperestraier" />
-</div>
-</form>
-});
+	if ($template->query(name => "searchform")) {
+		if (! defined $form) {
+			my $searchform = IkiWiki::template("searchform.tmpl", blind_cache => 1);
+			$searchform->param(searchaction => $IkiWiki::config{cgiurl});
+			$form=$searchform->output;
+		}
+
+		$template->param(searchform => $form);
+	}
 } #}}}
 
 sub delete (@) { #{{{
@@ -53,7 +55,7 @@ sub change (@) { #{{{
 	IkiWiki::debug("updating hyperestraier search index");
 	IkiWiki::estcmd("gather -cm -bc -cl -sd",
 		map {
-			$IkiWiki::config{destdir}."/".$IkiWiki::renderedfiles{IkiWiki::pagename($_)}
+			Encode::encode_utf8($IkiWiki::config{destdir}."/".$IkiWiki::renderedfiles{IkiWiki::pagename($_)})
 		} @_
 	);
 	IkiWiki::estcfg();
@@ -87,9 +89,7 @@ sub estcfg () { #{{{
 	close TEMPLATE;
 	open(TEMPLATE, ">$estdir/$cgi.conf") ||
 		error("write $estdir/$cgi.conf: $!");
-	my $template=HTML::Template->new(
-		filename => "$config{templatedir}/estseek.conf"
-	);
+	my $template=template("estseek.conf");
 	eval q{use Cwd 'abs_path'};
 	$template->param(
 		index => $estdir,