search: Converted to use xapian-omega.

Everything is done except for the actual indexing. I plan to do incremental
indexing as pages change.

1 files changed, 26 insertions, 98 deletions

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 9bf223cf0..e705d018a 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# hyperestraier search engine plugin
+# xapian-omega search engine plugin
 package IkiWiki::Plugin::search;
 
 use warnings;
@@ -7,33 +7,32 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
-	hook(type => "getopt", id => "hyperestraier",
-		call => \&getopt);
-	hook(type => "checkconfig", id => "hyperestraier",
-		call => \&checkconfig);
-	hook(type => "pagetemplate", id => "hyperestraier",
-		call => \&pagetemplate);
-	hook(type => "delete", id => "hyperestraier",
-		call => \&delete);
-	hook(type => "change", id => "hyperestraier",
-		call => \&change);
-	hook(type => "cgi", id => "hyperestraier",
-		call => \&cgi);
+	hook(type => "checkconfig", id => "search", call => \&checkconfig);
+	hook(type => "pagetemplate", id => "search", call => \&pagetemplate);
+	hook(type => "delete", id => "search", call => \&delete);
+	hook(type => "change", id => "search", call => \&change);
+	hook(type => "cgi", id => "search", 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}) {
 			error(sprintf(gettext("Must specify %s when using the search plugin"), $required));
 		}
 	}
+
+	if (! exists $config{omega_cgi}) {
+		$config{omega_cgi}="/usr/lib/cgi-bin/omega/omega";
+	}
+	
+	if (! -e $config{wikistatedir}."/xapian" || $config{rebuild}) {
+		writefile("omega.conf", $config{wikistatedir}."/xapian",
+			"database_dir .\n".
+			"template_dir ./templates\n");
+		writefile("query", $config{wikistatedir}."/xapian/templates",
+			IkiWiki::misctemplate(gettext("search"),
+				readfile(IkiWiki::template_file("searchquery.tmpl"))));
+	}
 } #}}}
 
 my $form;
@@ -55,93 +54,22 @@ sub pagetemplate (@) { #{{{
 } #}}}
 
 sub delete (@) { #{{{
-	debug(gettext("cleaning hyperestraier search index"));
-	estcmd("purge -cl");
-	estcfg();
+	debug(gettext("cleaning xapian search index"));
 } #}}}
 
 sub change (@) { #{{{
-	debug(gettext("updating hyperestraier search index"));
-	estcmd("gather -cm -bc -cl -sd",
-		map {
-			map {
-				Encode::encode_utf8($config{destdir}."/".$_)
-			} @{$renderedfiles{pagename($_)}};
-		} @_
-	);
-	estcfg();
+	debug(gettext("updating xapian search index"));
 } #}}}
 
 sub cgi ($) { #{{{
 	my $cgi=shift;
 
-	if (defined $cgi->param('phrase') || defined $cgi->param("navi")) {
+	if (defined $cgi->param('P')) {
 		# only works for GET requests
-		chdir("$config{wikistatedir}/hyperestraier") || error("chdir: $!");
-		exec("./".IkiWiki::basename($config{cgiurl})) || error("estseek.cgi failed");
-	}
-} #}}}
-
-my $configured=0;
-sub estcfg () { #{{{
-	return if $configured;
-	$configured=1;
-	
-	my $estdir="$config{wikistatedir}/hyperestraier";
-	my $cgi=IkiWiki::basename($config{cgiurl});
-	$cgi=~s/\..*$//;
-
-	my $newfile="$estdir/$cgi.tmpl.new";
-	my $cleanup = sub { unlink($newfile) };
-	open(TEMPLATE, ">:utf8", $newfile) || error("open $newfile: $!", $cleanup);
-	print TEMPLATE IkiWiki::misctemplate("search", 
-		"<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n",
-		forcebaseurl => 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(
-		index => $estdir,
-		tmplfile => "$estdir/$cgi.tmpl",
-		destdir => abs_path($config{destdir}),
-		url => $config{url},
-	);
-	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);
-	my $estseek = defined $config{estseek} ? $config{estseek} : '/usr/lib/estraier/estseek.cgi';
-	symlink($estseek, $cgi) || error("symlink $estseek $cgi: $!");
-} # }}}
-
-sub estcmd ($;@) { #{{{
-	my @params=split(' ', shift);
-	push @params, "-cl", "$config{wikistatedir}/hyperestraier";
-	if (@_) {
-		push @params, "-";
-	}
-	
-	my $pid=open(CHILD, "|-");
-	if ($pid) {
-		# parent
-		foreach (@_) {
-			print CHILD "$_\n";
-		}
-		close(CHILD) || print STDERR "estcmd @params exited nonzero: $?\n";
-	}
-	else {
-		# child
-		open(STDOUT, "/dev/null"); # shut it up (closing won't work)
-		exec("estcmd", @params) || error("can't run estcmd");
+		chdir("$config{wikistatedir}/xapian") || error("chdir: $!");
+		$ENV{OMEGA_CONFIG_FILE}="./omega.conf";
+		$ENV{CGIURL}=$config{cgiurl},
+		exec($config{omega_cgi}) || error("$config{omega_cgi} failed: $!");
 	}
 } #}}}