add news item for ikiwiki 3.20101129

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c9a69f443e3f6ce165840d860908b708fcad7741..8fb9dff0ca082bb16b6332c052e848408db162b8 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -10,9 +10,10 @@ 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 => "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 => "indexhtml", id => "search", call => \&indexhtml);

        hook(type => "delete", id => "search", call => \&delete);
        hook(type => "cgi", id => "search", call => \&cgi);
        hook(type => "delete", id => "search", call => \&delete);
        hook(type => "cgi", id => "search", call => \&cgi);

+       hook(type => "disable", id => "search", call => \&disable);

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -44,7 +45,7 @@ sub checkconfig () {
 
        # This is a mass dependency, so if the search form template
        # changes, every page is rebuilt.
 
        # This is a mass dependency, so if the search form template
        # changes, every page is rebuilt.

-       add_depends("", "searchform.tmpl");
+       add_depends("", "templates/searchform.tmpl");

 }
 
 my $form;
 }
 
 my $form;


@@ -58,6 +59,7 @@ sub pagetemplate (@) {
                if (! defined $form) {
                        my $searchform = template("searchform.tmpl", blind_cache => 1);
                        $searchform->param(searchaction => $config{cgiurl});
                if (! defined $form) {
                        my $searchform = template("searchform.tmpl", blind_cache => 1);
                        $searchform->param(searchaction => $config{cgiurl});

+                       $searchform->param(html5 => $config{html5});

                        $form=$searchform->output;
                }
 
                        $form=$searchform->output;
                }
 


@@ -67,7 +69,7 @@ sub pagetemplate (@) {
 
 my $scrubber;
 my $stemmer;
 
 my $scrubber;
 my $stemmer;

-sub index (@) {
+sub indexhtml (@) {

        my %params=@_;
 
        setupfiles();
        my %params=@_;
 
        setupfiles();


@@ -111,12 +113,17 @@ sub index (@) {
        }
        $sample=~s/\n/ /g;
        
        }
        $sample=~s/\n/ /g;
        

+       my $url=urlto($params{destpage}, "");
+       if (defined $pagestate{$params{page}}{meta}{permalink}) {
+               $url=$pagestate{$params{page}}{meta}{permalink}
+       }
+

        # data used by omega
        # Decode html entities in it, since omega re-encodes them.
        eval q{use HTML::Entities};
        error $@ if $@;
        $doc->set_data(
        # data used by omega
        # Decode html entities in it, since omega re-encodes them.
        eval q{use HTML::Entities};
        error $@ if $@;
        $doc->set_data(

-               "url=".urlto($params{page}, "")."\n".
+               "url=".$url."\n".

                "sample=".decode_entities($sample)."\n".
                "caption=".decode_entities($caption)."\n".
                "modtime=$IkiWiki::pagemtime{$params{page}}\n".
                "sample=".decode_entities($sample)."\n".
                "caption=".decode_entities($caption)."\n".
                "modtime=$IkiWiki::pagemtime{$params{page}}\n".


@@ -183,15 +190,15 @@ sub pageterm ($) {
        # 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) {
        # 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};
+               eval q{use Digest::SHA};

                if ($@) {
                if ($@) {

-                       debug("search: ".sprintf(gettext("need Digest::SHA1 to index %s"), $page)) if $@;
+                       debug("search: ".sprintf(gettext("need Digest::SHA 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 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));
+               return "U".lc(Digest::SHA::sha1_hex($page));

        }
        else {
                return "U:".$page;
        }
        else {
                return "U:".$page;


@@ -222,7 +229,9 @@ sub setupfiles () {
                
                # Avoid omega interpreting anything in the misctemplate
                # as an omegascript command.
                
                # Avoid omega interpreting anything in the misctemplate
                # as an omegascript command.

-               my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0");
+               my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0",
+                       searchform => "", # avoid showing the small search form
+               );

                eval q{use HTML::Entities};
                error $@ if $@;
                $misctemplate=encode_entities($misctemplate, '\$');
                eval q{use HTML::Entities};
                error $@ if $@;
                $misctemplate=encode_entities($misctemplate, '\$');


@@ -237,4 +246,10 @@ sub setupfiles () {
 }
 }
 
 }
 }
 

+sub disable () {
+       if (-d $config{wikistatedir}."/xapian") {
+               system("rm", "-rf", $config{wikistatedir}."/xapian");
+       }
+}
+

 1
 1