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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 284f477fa..e40f4888c 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -7,13 +7,29 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
+	hook(type => "getsetup", id => "search", call => \&getsetup);
 	hook(type => "checkconfig", id => "search", call => \&checkconfig);
 	hook(type => "pagetemplate", id => "search", call => \&pagetemplate);
-	hook(type => "sanitize", id => "search", call => \&index);
+	hook(type => "postscan", id => "search", call => \&index);
 	hook(type => "delete", id => "search", call => \&delete);
 	hook(type => "cgi", id => "search", call => \&cgi);
 } # }}}
 
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
+		omega_cgi => {
+			type => "string",
+			example => "/usr/lib/cgi-bin/omega/omega",
+			description => "path to the omega cgi program",
+			safe => 0, # external program
+			rebuild => 0,
+		},
+} #}}}
+
 sub checkconfig () { #{{{
 	foreach my $required (qw(url cgiurl)) {
 		if (! length $config{$required}) {
@@ -21,7 +37,7 @@ sub checkconfig () { #{{{
 		}
 	}
 	
-	if (! exists $config{omega_cgi}) {
+	if (! defined $config{omega_cgi}) {
 		$config{omega_cgi}="/usr/lib/cgi-bin/omega/omega";
 	}
 } #}}}
@@ -48,8 +64,6 @@ my $scrubber;
 my $stemmer;
 sub index (@) { #{{{
 	my %params=@_;
-	
-	return $params{content} if $IkiWiki::preprocessing{$params{destpage}};
 
 	setupfiles();
 
@@ -59,7 +73,7 @@ sub index (@) { #{{{
 	
 	my $db=xapiandb();
 	my $doc=Search::Xapian::Document->new();
-	my $caption=IkiWiki::pagetitle($params{page});
+	my $caption=pagetitle($params{page});
 	my $title;
 	if (exists $pagestate{$params{page}}{meta} &&
 		exists $pagestate{$params{page}}{meta}{title}) {
@@ -125,15 +139,13 @@ sub index (@) { #{{{
 	$tg->index_text($caption, 2);
 	$tg->index_text($title, 2) if $title ne $caption;
 	$tg->index_text($toindex);
-	$tg->index_text(lc($title), 1, "ZS"); # for title:foo
+	$tg->index_text(lc($title), 1, "S"); # for title:foo
 	foreach my $link (@{$links{$params{page}}}) {
-		$tg->index_text(lc($link), 1, "ZLINK"); # for link:bar
+		$tg->index_text(lc($link), 1, "XLINK"); # for link:bar
 	}
 
 	$doc->add_term($pageterm);
 	$db->replace_document_by_term($pageterm, $doc);
-
-	return $params{content};
 } #}}}
 
 sub delete (@) { #{{{