X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/db9f2b1b2b97fd92b09f170c3b567ec59030bf0a..f62b4f45039a1acb5f9173b0835475d28c1058a5:/IkiWiki/Plugin/search.pm

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 3f0b7c9ad..42d2e0d30 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -14,6 +14,9 @@ sub import {
 	hook(type => "delete", id => "search", call => \&delete);
 	hook(type => "cgi", id => "search", call => \&cgi);
 	hook(type => "disable", id => "search", call => \&disable);
+	hook(type => "needsbuild", id => "search", call => \&needsbuild);
+		
+	eval q{ use Search::Xapian }; # load early to work around #622591
 }
 
 sub getsetup () {
@@ -189,7 +192,8 @@ sub pageterm ($) {
 
 	# 240 is the number used by omindex to decide when to hash an
 	# overlong term. This does not use a compatible hash method though.
-	if (length $page > 240) {
+	eval q{use Encode};
+	if (length encode_utf8($page) > 240) {
 		eval q{use Digest::SHA};
 		if ($@) {
 			debug("search: ".sprintf(gettext("need Digest::SHA to index %s"), $page)) if $@;
@@ -226,27 +230,39 @@ sub setupfiles () {
 		writefile("omega.conf", $config{wikistatedir}."/xapian",
 			"database_dir .\n".
 			"template_dir ./templates\n");
-		
-		# Avoid omega interpreting anything in the cgitemplate
-		# as an omegascript command.
-		eval q{use IkiWiki::CGI};
-		my $template=IkiWiki::cgitemplate(undef, gettext("search"), "\0",
-			searchform => "", # avoid showing the small search form
-		);
-		eval q{use HTML::Entities};
-		error $@ if $@;
-		$template=encode_entities($template, '\$');
-
-		my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl"));
-		$template=~s/\0/$querytemplate/;
-
-		writefile("query", $config{wikistatedir}."/xapian/templates",
-			$template);
+		omega_template();	
 		$setup=1;
 	}
 }
 }
 
+sub needsbuild {
+	my $list=shift;
+	if (grep {
+		$_ eq "templates/page.tmpl" ||
+		$_ eq "templates/searchquery.tmpl"
+	} @$list) {
+		omega_template();
+	}
+}
+
+sub omega_template {
+	# Avoid omega interpreting anything in the cgitemplate
+	# as an omegascript command.
+	eval q{use IkiWiki::CGI};
+	my $template=IkiWiki::cgitemplate(undef, gettext("search"), "\0",
+		searchform => "", # avoid showing the small search form
+	);
+	eval q{use HTML::Entities};
+	error $@ if $@;
+	$template=encode_entities($template, '\$');
+
+	my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl"));
+	$template=~s/\0/$querytemplate/;
+	writefile("query", $config{wikistatedir}."/xapian/templates",
+		$template);
+}
+
 sub disable () {
 	if (-d $config{wikistatedir}."/xapian") {
 		system("rm", "-rf", $config{wikistatedir}."/xapian");