also decode html entities in the title

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 3dc70f0b792bd89cb8dc668463dbb66f4ba5df99..5e1d98a7248a643d438bfb88086c3ac2d906df5a 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -57,7 +57,7 @@ my $scrubber;
 sub index (@) { #{{{
        my %params=@_;
        
-       return $params{content} if %IkiWiki::preprocessing;
+       return $params{content} if $IkiWiki::preprocessing{$params{destpage}};
        
        my $db=xapiandb();
        my $doc=Search::Xapian::Document->new();
@@ -70,7 +70,7 @@ sub index (@) { #{{{
                $title=IkiWiki::pagetitle($params{page});
        }
 
-       # Remove any html from text to be indexed.
+       # Remove html from text to be indexed.
        if (! defined $scrubber) {
                eval q{use HTML::Scrubber};
                if (! $@) {
@@ -94,10 +94,12 @@ sub index (@) { #{{{
        $sample=~s/\n/ /g;
        
        # 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"
        );
@@ -119,7 +121,7 @@ sub index (@) { #{{{
 sub delete (@) { #{{{
        my $db=xapiandb();
        foreach my $page (@_) {
-               $db->delete_document_by_term(pageterm($page));
+               $db->delete_document_by_term(pageterm(pagename($page)));
        }
 } #}}}