don't use meta title

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 1ee1b8fdb9bf52bae52d67b517f0a2032287e23d..29d31dfdc15d0e00ab326a5f9cce0aeeb54eb35c 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -54,6 +54,7 @@ sub pagetemplate (@) { #{{{
 } #}}}
 
 my $scrubber;
+my $stemmer;
 sub index (@) { #{{{
        my %params=@_;
        
@@ -61,14 +62,7 @@ sub index (@) { #{{{
        
        my $db=xapiandb();
        my $doc=Search::Xapian::Document->new();
-       my $title;
-       if (exists $pagestate{$params{page}}{meta} &&
-           exists $pagestate{$params{page}}{meta}{title}) {
-               $title=$pagestate{$params{page}}{meta}{title};
-       }
-       else {
-               $title=IkiWiki::pagetitle($params{page});
-       }
+       my $title=IkiWiki::pagetitle($params{page});
 
        # Remove html from text to be indexed.
        if (! defined $scrubber) {
@@ -92,21 +86,28 @@ sub index (@) { #{{{
                }
        }
        $sample=~s/\n/ /g;
-       # Decode html entities in the sample since omega encodes them.
-       eval q{use HTML::Entities};
-       $sample=decode_entities($sample);
        
        # data used by omega
+       # Decode html entities in it, since omega re-encodes them.
+       eval q{use HTML::Entities};
        $doc->set_data(
                "url=".urlto($params{page}, "")."\n".
-               "sample=$sample\n".
-               "caption=$title\n".
+               "sample=".decode_entities($sample)."\n".
+               "caption=".decode_entities($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"));
+       if (! $stemmer) {
+               my $langcode=$ENV{LANG} || "en";
+               $langcode=~s/_.*//;
+               eval { $stemmer=Search::Xapian::Stem->new($langcode) };
+               if ($@) {
+                       $stemmer=Search::Xapian::Stem->new("english");
+               }
+       }
+       $tg->set_stemmer($stemmer);
        $tg->set_document($doc);
        $tg->index_text($params{page}, 2);
        $tg->index_text($title, 2);