Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 249f267b970bcf422b698d9a45dcb0183f15bc58..284f477fae5b32f63f9c9159f06c4af84dea2acd 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -20,19 +20,10 @@ sub checkconfig () { #{{{
                        error(sprintf(gettext("Must specify %s when using the search plugin"), $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 (! 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;
 } #}}}
 
 my $form;


@@ -59,6 +50,12 @@ sub index (@) { #{{{
        my %params=@_;
        
        return $params{content} if $IkiWiki::preprocessing{$params{destpage}};
        my %params=@_;
        
        return $params{content} if $IkiWiki::preprocessing{$params{destpage}};

+
+       setupfiles();
+
+       # A unique pageterm is used to identify the document for a page.
+       my $pageterm=pageterm($params{page});
+       return $params{content} unless defined $pageterm;

        
        my $db=xapiandb();
        my $doc=Search::Xapian::Document->new();
        
        my $db=xapiandb();
        my $doc=Search::Xapian::Document->new();


@@ -111,8 +108,14 @@ sub index (@) { #{{{
        if (! $stemmer) {
                my $langcode=$ENV{LANG} || "en";
                $langcode=~s/_.*//;
        if (! $stemmer) {
                my $langcode=$ENV{LANG} || "en";
                $langcode=~s/_.*//;

-               eval { $stemmer=Search::Xapian::Stem->new($langcode) };
-               if ($@) {
+
+               # This whitelist is here to work around a xapian bug (#486138)
+               my @whitelist=qw{da de en es fi fr hu it no pt ru ro sv tr};
+
+               if (grep { $_ eq $langcode } @whitelist) {
+                       $stemmer=Search::Xapian::Stem->new($langcode);
+               }
+               else {

                        $stemmer=Search::Xapian::Stem->new("english");
                }
        }
                        $stemmer=Search::Xapian::Stem->new("english");
                }
        }


@@ -127,8 +130,6 @@ sub index (@) { #{{{
                $tg->index_text(lc($link), 1, "ZLINK"); # for link:bar
        }
 
                $tg->index_text(lc($link), 1, "ZLINK"); # for link:bar
        }
 

-       # A unique pageterm is used to identify the document for a page.
-       my $pageterm=pageterm($params{page});

        $doc->add_term($pageterm);
        $db->replace_document_by_term($pageterm, $doc);
 
        $doc->add_term($pageterm);
        $db->replace_document_by_term($pageterm, $doc);
 


@@ -138,7 +139,8 @@ sub index (@) { #{{{
 sub delete (@) { #{{{
        my $db=xapiandb();
        foreach my $page (@_) {
 sub delete (@) { #{{{
        my $db=xapiandb();
        foreach my $page (@_) {

-               $db->delete_document_by_term(pageterm(pagename($page)));
+               my $pageterm=pageterm(pagename($page));
+               $db->delete_document_by_term($pageterm) if defined $pageterm;

        }
 } #}}}
 
        }
 } #}}}
 


@@ -150,6 +152,9 @@ sub cgi ($) { #{{{
                chdir("$config{wikistatedir}/xapian") || error("chdir: $!");
                $ENV{OMEGA_CONFIG_FILE}="./omega.conf";
                $ENV{CGIURL}=$config{cgiurl},
                chdir("$config{wikistatedir}/xapian") || error("chdir: $!");
                $ENV{OMEGA_CONFIG_FILE}="./omega.conf";
                $ENV{CGIURL}=$config{cgiurl},

+               IkiWiki::loadindex();
+               $ENV{HELPLINK}=htmllink("", "", "ikiwiki/searching",
+                       noimageinline => 1, linktext => "Help");

                exec($config{omega_cgi}) || error("$config{omega_cgi} failed: $!");
        }
 } #}}}
                exec($config{omega_cgi}) || error("$config{omega_cgi} failed: $!");
        }
 } #}}}


@@ -157,9 +162,22 @@ sub cgi ($) { #{{{
 sub pageterm ($) { #{{{
        my $page=shift;
 
 sub pageterm ($) { #{{{
        my $page=shift;
 

-       # TODO: check if > 255 char page names overflow term
-       # length; use sha1 if so?
-       return "U:".$page;
+       # 240 is the number used by omindex to decide when to hash an
+       # overlong term. This does not use a compatible hash method though.
+       if (length $page > 240) {
+               eval q{use Digest::SHA1};
+               if ($@) {
+                       debug("search: ".sprintf(gettext("need Digest::SHA1 to index %s"), $page)) if $@;
+                       return undef;
+               }
+
+               # Note no colon, therefore it's guaranteed to not overlap
+               # with a page with the same name as the hash..
+               return "U".lc(Digest::SHA1::sha1_hex($page));
+       }
+       else {
+               return "U:".$page;
+       }

 } #}}}
 
 my $db;
 } #}}}
 
 my $db;


@@ -176,4 +194,19 @@ sub xapiandb () { #{{{
        return $db;
 } #}}}
 
        return $db;
 } #}}}
 

+{
+my $setup=0;
+sub setupfiles () { #{{{
+       if (! $setup and (! -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"))));
+               $setup=1;
+       }
+} #}}}
+}
+

 1
 1