Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index ff18e1faf4eccd4119dcb1e6a4128c62cec41396..e40f4888c44721005ab96d9a1bb4590b13fcea89 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -17,9 +17,13 @@ sub import { #{{{
 
 sub getsetup () { #{{{
        return
 
 sub getsetup () { #{{{
        return

+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },

                omega_cgi => {
                        type => "string",
                omega_cgi => {
                        type => "string",

-                       default => "/usr/lib/cgi-bin/omega/omega",
+                       example => "/usr/lib/cgi-bin/omega/omega",

                        description => "path to the omega cgi program",
                        safe => 0, # external program
                        rebuild => 0,
                        description => "path to the omega cgi program",
                        safe => 0, # external program
                        rebuild => 0,


@@ -33,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";
        }
 } #}}}


@@ -69,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}) {