Replace Verisign logo with one done in Inkscape

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c578b44ab2693326d083a640d18f8c88cf06b042..24b16fe2a78c4607f89788cd78ea1d7e5a1ac137 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -13,6 +13,10 @@ sub import {
        hook(type => "indexhtml", id => "search", call => \&indexhtml);
        hook(type => "delete", id => "search", call => \&delete);
        hook(type => "cgi", id => "search", call => \&cgi);
        hook(type => "indexhtml", id => "search", call => \&indexhtml);
        hook(type => "delete", id => "search", call => \&delete);
        hook(type => "cgi", id => "search", call => \&cgi);

+       hook(type => "disable", id => "search", call => \&disable);
+       hook(type => "needsbuild", id => "search", call => \&needsbuild);
+               
+       eval q{ use Search::Xapian }; # load early to work around #622591

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


@@ -29,6 +33,13 @@ sub getsetup () {
                        safe => 0, # external program
                        rebuild => 0,
                },
                        safe => 0, # external program
                        rebuild => 0,
                },

+               google_search => {
+                       type => "booblean",
+                       example => 1,
+                       description => "use google site search rather than internal xapian index?",
+                       safe => 1,
+                       rebuild => 0,
+               },

 }
 
 sub checkconfig () {
 }
 
 sub checkconfig () {


@@ -57,7 +68,7 @@ sub pagetemplate (@) {
        if ($template->query(name => "searchform")) {
                if (! defined $form) {
                        my $searchform = template("searchform.tmpl", blind_cache => 1);
        if ($template->query(name => "searchform")) {
                if (! defined $form) {
                        my $searchform = template("searchform.tmpl", blind_cache => 1);

-                       $searchform->param(searchaction => $config{cgiurl});
+                       $searchform->param(searchaction => IkiWiki::cgiurl());

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


@@ -71,6 +82,8 @@ my $stemmer;
 sub indexhtml (@) {
        my %params=@_;
 
 sub indexhtml (@) {
        my %params=@_;
 

+       return if $config{google_search};
+

        setupfiles();
 
        # A unique pageterm is used to identify the document for a page.
        setupfiles();
 
        # A unique pageterm is used to identify the document for a page.


@@ -112,12 +125,17 @@ sub indexhtml (@) {
        }
        $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{destpage}, "")."\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".


@@ -156,6 +174,8 @@ sub indexhtml (@) {
 }
 
 sub delete (@) {
 }
 
 sub delete (@) {

+       return if $config{google_search};
+

        my $db=xapiandb();
        foreach my $page (@_) {
                my $pageterm=pageterm(pagename($page));
        my $db=xapiandb();
        foreach my $page (@_) {
                my $pageterm=pageterm(pagename($page));


@@ -167,14 +187,20 @@ sub cgi ($) {
        my $cgi=shift;
 
        if (defined $cgi->param('P')) {
        my $cgi=shift;
 
        if (defined $cgi->param('P')) {

-               # only works for GET requests
-               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: $!");
+               if ($config{google_search}) {
+                       print $cgi->redirect("https://www.google.com/search?sitesearch=$config{url}&q=".$cgi->param('P'));
+                       exit 0;
+               }
+               else {
+                       # only works for GET requests
+                       chdir("$config{wikistatedir}/xapian") || error("chdir: $!");
+                       $ENV{OMEGA_CONFIG_FILE}="./omega.conf";
+                       $ENV{CGIURL}=IkiWiki::cgiurl();
+                       IkiWiki::loadindex();
+                       $ENV{HELPLINK}=htmllink("", "", "ikiwiki/searching",
+                               noimageinline => 1, linktext => "Help");
+                       exec($config{omega_cgi}) || error("$config{omega_cgi} failed: $!");
+               }

        }
 }
 
        }
 }
 


@@ -183,16 +209,17 @@ 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.
 
        # 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 Encode};
+       if (length encode_utf8($page) > 240) {
+               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;


@@ -220,22 +247,43 @@ sub setupfiles () {
                writefile("omega.conf", $config{wikistatedir}."/xapian",
                        "database_dir .\n".
                        "template_dir ./templates\n");
                writefile("omega.conf", $config{wikistatedir}."/xapian",
                        "database_dir .\n".
                        "template_dir ./templates\n");

-               
-               # Avoid omega interpreting anything in the misctemplate
-               # as an omegascript command.
-               my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0");
-               eval q{use HTML::Entities};
-               error $@ if $@;
-               $misctemplate=encode_entities($misctemplate, '\$');
-
-               my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl"));
-               $misctemplate=~s/\0/$querytemplate/;
-
-               writefile("query", $config{wikistatedir}."/xapian/templates",
-                       $misctemplate);
+               omega_template();       

                $setup=1;
        }
 }
 }
 
                $setup=1;
        }
 }
 }
 

+sub needsbuild {
+       my $list=shift;
+       if (grep {
+               $_ eq "templates/page.tmpl" ||
+               $_ eq "templates/searchquery.tmpl"
+       } @$list) {
+               omega_template();
+       }
+}
+
+sub omega_template {
+       # Avoid omega interpreting anything in the cgitemplate
+       # as an omegascript command.
+       eval q{use IkiWiki::CGI};
+       my $template=IkiWiki::cgitemplate(undef, gettext("search"), "\0",
+               searchform => "", # avoid showing the small search form
+       );
+       eval q{use HTML::Entities};
+       error $@ if $@;
+       $template=encode_entities($template, '\$');
+
+       my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl"));
+       $template=~s/\0/$querytemplate/;
+       writefile("query", $config{wikistatedir}."/xapian/templates",
+               $template);
+}
+
+sub disable () {
+       if (-d $config{wikistatedir}."/xapian") {
+               system("rm", "-rf", $config{wikistatedir}."/xapian");
+       }
+}
+

 1
 1