X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d7c4001748f8c9f765e39b0d8ebe2d3d0f8cb0ab..8d4342183b1c3a96797def6fff96feebacb90db6:/IkiWiki/Plugin/search.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index ab7c0eebb..f9193b6aa 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -15,6 +15,8 @@ sub import {
 	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 () {
@@ -31,6 +33,13 @@ sub getsetup () {
 			safe => 0, # external program
 			rebuild => 0,
 		},
+		google_search => {
+			type => "boolean",
+			example => 1,
+			description => "use google site search rather than internal xapian index?",
+			safe => 1,
+			rebuild => 0,
+		},
 }
 
 sub checkconfig () {
@@ -73,6 +82,8 @@ my $stemmer;
 sub indexhtml (@) {
 	my %params=@_;
 
+	return if $config{google_search};
+
 	setupfiles();
 
 	# A unique pageterm is used to identify the document for a page.
@@ -163,6 +174,8 @@ sub indexhtml (@) {
 }
 
 sub delete (@) {
+	return if $config{google_search};
+
 	my $db=xapiandb();
 	foreach my $page (@_) {
 		my $pageterm=pageterm(pagename($page));
@@ -174,14 +187,20 @@ sub cgi ($) {
 	my $cgi=shift;
 
 	if (defined $cgi->param('P')) {
-		# only works for GET requests
-		chdir("$config{wikistatedir}/xapian") || error("chdir: $!");
-		$ENV{OMEGA_CONFIG_FILE}="./omega.conf";
-		$ENV{CGIURL}=IkiWiki::cgiurl();
-		IkiWiki::loadindex();
-		$ENV{HELPLINK}=htmllink("", "", "ikiwiki/searching",
-			noimageinline => 1, linktext => "Help");
-		exec($config{omega_cgi}) || error("$config{omega_cgi} failed: $!");
+		if ($config{google_search}) {
+			print $cgi->redirect("https://www.google.com/search?sitesearch=$config{url}&q=".$cgi->param('P'));
+			exit 0;
+		}
+		else {
+			# only works for GET requests
+			chdir("$config{wikistatedir}/xapian") || error("chdir: $!");
+			$ENV{OMEGA_CONFIG_FILE}="./omega.conf";
+			$ENV{CGIURL}=IkiWiki::cgiurl();
+			IkiWiki::loadindex();
+			$ENV{HELPLINK}=htmllink("", "", "ikiwiki/searching",
+				noimageinline => 1, linktext => "Help");
+			exec($config{omega_cgi}) || error("$config{omega_cgi} failed: $!");
+		}
 	}
 }
 
@@ -190,7 +209,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 $@;