urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimise url parsing and add guard against failure to parse

master
Joey Hess 2008-10-10 17:09:33 -04:00
parent f9957d11ed
commit 643c0f1afc
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
IkiWiki/Plugin/google.pm
View File

@ -6,6 +6,8 @@ use strict;
use IkiWiki 2.00; use IkiWiki 2.00;
use URI; use URI;
my $host;
sub import { #{{{ sub import { #{{{
hook(type => "getsetup", id => "google", call => \&getsetup); hook(type => "getsetup", id => "google", call => \&getsetup);
hook(type => "checkconfig", id => "google", call => \&checkconfig); hook(type => "checkconfig", id => "google", call => \&checkconfig);
@ -21,11 +23,14 @@ sub getsetup () { #{{{
} #}}} } #}}}
sub checkconfig () { #{{{ sub checkconfig () { #{{{
foreach my $required (qw(url)) { if (! length $config{url}) {
if (! length $config{$required}) { error(sprintf(gettext("Must specify %s when using the google search plugin"), "url"));
error(sprintf(gettext("Must specify %s when using the google search plugin"), $required));
}
} }
my $uri=URI->new($config{url});
if (! $uri || ! defined $uri->host) {
error(gettext("Failed to parse url, cannot determine domain name"));
}
$host=$uri->host;
} #}}} } #}}}
my $form; my $form;
@ -38,7 +43,7 @@ sub pagetemplate (@) { #{{{
if ($template->query(name => "searchform")) { if ($template->query(name => "searchform")) {
if (! defined $form) { if (! defined $form) {
my $searchform = template("googleform.tmpl", blind_cache => 1); my $searchform = template("googleform.tmpl", blind_cache => 1);
$searchform->param(sitefqdn => URI->new($config{url})->host); $searchform->param(sitefqdn => $host);
$form=$searchform->output; $form=$searchform->output;
} }