Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / IkiWiki / Plugin / search.pm

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 822b5974eca016a21043b1bf2aba92a3410ea8bc..e40f4888c44721005ab96d9a1bb4590b13fcea89 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -7,6 +7,7 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
 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 => "postscan", id => "search", call => \&index);
        hook(type => "checkconfig", id => "search", call => \&checkconfig);
        hook(type => "pagetemplate", id => "search", call => \&pagetemplate);
        hook(type => "postscan", id => "search", call => \&index);


@@ -14,6 +15,21 @@ sub import { #{{{
        hook(type => "cgi", id => "search", call => \&cgi);
 } # }}}
 
        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}) {
 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";
        }
 } #}}}
                $config{omega_cgi}="/usr/lib/cgi-bin/omega/omega";
        }
 } #}}}


@@ -57,7 +73,7 @@ sub index (@) { #{{{
        
        my $db=xapiandb();
        my $doc=Search::Xapian::Document->new();
        
        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}) {
        my $title;
        if (exists $pagestate{$params{page}}{meta} &&
                exists $pagestate{$params{page}}{meta}{title}) {


@@ -123,9 +139,9 @@ sub index (@) { #{{{
        $tg->index_text($caption, 2);
        $tg->index_text($title, 2) if $title ne $caption;
        $tg->index_text($toindex);
        $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}}}) {
        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);
        }
 
        $doc->add_term($pageterm);