Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
one more patch: but expanding the memoization is actually a slowdown for the docwiki
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
google.pm
diff --git
a/IkiWiki/Plugin/google.pm
b/IkiWiki/Plugin/google.pm
index 4bba5775c2ba8583fc06504496e39792c2107bad..68cde261c66748c5d32475657986ce9d465fbbbf 100644
(file)
--- a/
IkiWiki/Plugin/google.pm
+++ b/
IkiWiki/Plugin/google.pm
@@
-6,8
+6,6
@@
use strict;
use IkiWiki 3.00;
use URI;
use IkiWiki 3.00;
use URI;
-my $host;
-
sub import {
hook(type => "getsetup", id => "google", call => \&getsetup);
hook(type => "checkconfig", id => "google", call => \&checkconfig);
sub import {
hook(type => "getsetup", id => "google", call => \&getsetup);
hook(type => "checkconfig", id => "google", call => \&checkconfig);
@@
-19,18
+17,18
@@
sub getsetup () {
plugin => {
safe => 1,
rebuild => 1,
plugin => {
safe => 1,
rebuild => 1,
+ section => "web",
},
}
sub checkconfig () {
if (! length $config{url}) {
},
}
sub checkconfig () {
if (! length $config{url}) {
- error(sprintf(gettext("Must specify %s when using the google search plugin"), "url"));
- }
- my $uri=URI->new($config{url});
- if (! $uri || ! defined $uri->host) {
- error(gettext("Failed to parse url, cannot determine domain name"));
+ error(sprintf(gettext("Must specify %s when using the %s plugin"), "url", 'google'));
}
}
- $host=$uri->host;
+
+ # This is a mass dependency, so if the search form template
+ # changes, every page is rebuilt.
+ add_depends("", "templates/googleform.tmpl");
}
my $form;
}
my $form;
@@
-43,7
+41,8
@@
sub pagetemplate (@) {
if ($template->query(name => "searchform")) {
if (! defined $form) {
my $searchform = template("googleform.tmpl", blind_cache => 1);
if ($template->query(name => "searchform")) {
if (! defined $form) {
my $searchform = template("googleform.tmpl", blind_cache => 1);
- $searchform->param(sitefqdn => $host);
+ $searchform->param(url => $config{url});
+ $searchform->param(html5 => $config{html5});
$form=$searchform->output;
}
$form=$searchform->output;
}