X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dfedb0351d154cd1d58e719012f4b1dda3a07666..44fde6cbff2aaa8d647084721320111e8807ea74:/IkiWiki/Plugin/search.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 2d8c3d4e1..a28d58a1d 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -1,30 +1,41 @@
 #!/usr/bin/perl
-# hyperestraier search engine plugin
+# xapian-omega search engine plugin
 package IkiWiki::Plugin::search;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
-	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);
+	# run last so other needsbuild hooks can modify the list
+	hook(type => "needsbuild", id => "search", call => \&needsbuild,
+		last => 1);
+	hook(type => "filter", id => "search", call => \&filter);
+	hook(type => "delete", id => "search", call => \&delete);
+	hook(type => "cgi", id => "search", call => \&cgi);
 } # }}}
 
 sub checkconfig () { #{{{
 	foreach my $required (qw(url cgiurl)) {
 		if (! length $config{$required}) {
-			error("Must specify $required when using the search plugin\n");
+			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;
@@ -45,84 +56,87 @@ sub pagetemplate (@) { #{{{
 	}
 } #}}}
 
-sub delete (@) { #{{{
-	debug("cleaning hyperestraier search index");
-	estcmd("purge -cl");
-	estcfg();
+my %toindex;
+sub needsbuild ($) { #{{{
+	%toindex = map { $_ => 1 } @{shift()};
 } #}}}
 
-sub change (@) { #{{{
-	debug("updating hyperestraier search index");
-	estcmd("gather -cm -bc -cl -sd",
-		map {
-			Encode::encode_utf8($config{destdir}."/".$renderedfiles{pagename($_)})
-		} @_
-	);
-	estcfg();
+sub filter (@) { #{{{
+	my %params=@_;
+	
+	if ($params{page} eq $params{destpage} && $toindex{$params{page}}) {
+		# index page
+		my $db=xapiandb();
+		my $doc=Search::Xapian::Document->new();
+		my $title=$params{page};
+		if (exists $pagestate{$params{page}}{meta} &&
+		    exists $pagestate{$params{page}}{meta}{title}) {
+			$title=$pagestate{$params{page}}{meta}{title};
+		}
+
+		# data used by omega
+		$doc->set_data(
+			"url=".urlto($params{page}, "")."\n".
+			"sample=\n". # TODO
+			"caption=$title\n".
+			"modtime=$IkiWiki::pagemtime{$params{page}}\n".
+			"size=".length($params{content})."\n"
+		);
+
+		my $tg = Search::Xapian::TermGenerator->new();
+		$tg->set_stemmer(new Search::Xapian::Stem("english"));
+		$tg->set_document($doc);
+		$tg->index_text($params{page}, 2);
+		$tg->index_text($title, 2);
+		$tg->index_text($params{content}); # TODO html strip; preprocessor too
+
+		my $pageterm=pageterm($params{page});
+		$doc->add_term($pageterm);
+		$db->replace_document_by_term($pageterm, $doc);
+	}
+
+	return $params{content};
+} #}}}
+
+sub delete (@) { #{{{
+	my $db=xapiandb();
+	foreach my $page (@_) {
+		$db->delete_document_by_term(pageterm($page));
+	}
 } #}}}
 
 sub cgi ($) { #{{{
 	my $cgi=shift;
 
-	if (defined $cgi->param('phrase')) {
+	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");
+		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: $!");
 	}
 } #}}}
 
-my $configured=0;
-sub estcfg () { #{{{
-	return if $configured;
-	$configured=1;
-	
-	my $estdir="$config{wikistatedir}/hyperestraier";
-	my $cgi=IkiWiki::basename($config{cgiurl});
-	$cgi=~s/\..*$//;
-	open(TEMPLATE, ">:utf8", "$estdir/$cgi.tmpl") ||
-		error("write $estdir/$cgi.tmpl: $!");
-	print TEMPLATE IkiWiki::misctemplate("search", 
-		"<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n",
-		baseurl => IkiWiki::dirname($config{cgiurl})."/");
-	close TEMPLATE;
-	open(TEMPLATE, ">$estdir/$cgi.conf") ||
-		error("write $estdir/$cgi.conf: $!");
-	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;
-	close TEMPLATE;
-	$cgi="$estdir/".IkiWiki::basename($config{cgiurl});
-	unlink($cgi);
-	symlink("/usr/lib/estraier/estseek.cgi", $cgi) ||
-		error("symlink $cgi: $!");
-} # }}}
+sub pageterm ($) { #{{{
+	my $page=shift;
 
-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) || error("estcmd @params exited nonzero: $?");
-	}
-	else {
-		# child
-		open(STDOUT, "/dev/null"); # shut it up (closing won't work)
-		exec("estcmd", @params) || error("can't run estcmd");
+	# TODO: check if > 255 char page names overflow term
+	# length; use sha1 if so?
+	return "P".$page;
+} #}}}
+
+my $db;
+sub xapiandb () { #{{{
+	if (! defined $db) {
+		eval q{
+			use Search::Xapian;
+			use Search::Xapian::WritableDatabase;
+		};
+		error($@) if $@;
+		$db=Search::Xapian::WritableDatabase->new($config{wikistatedir}."/xapian/default",
+			Search::Xapian::DB_CREATE_OR_OPEN());
 	}
+	return $db;
 } #}}}
 
 1