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
clean solution is not clean
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
search.pm
diff --git
a/IkiWiki/Plugin/search.pm
b/IkiWiki/Plugin/search.pm
index 8fb9dff0ca082bb16b6332c052e848408db162b8..3f0b7c9ad4c657db023be5e489f069768dc8201a 100644
(file)
--- a/
IkiWiki/Plugin/search.pm
+++ b/
IkiWiki/Plugin/search.pm
@@
-58,7
+58,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;
}
@@
-176,7
+176,7
@@
sub cgi ($) {
# only works for GET requests
chdir("$config{wikistatedir}/xapian") || error("chdir: $!");
$ENV{OMEGA_CONFIG_FILE}="./omega.conf";
# only works for GET requests
chdir("$config{wikistatedir}/xapian") || error("chdir: $!");
$ENV{OMEGA_CONFIG_FILE}="./omega.conf";
- $ENV{CGIURL}=
$config{cgiurl},
+ $ENV{CGIURL}=
IkiWiki::cgiurl();
IkiWiki::loadindex();
$ENV{HELPLINK}=htmllink("", "", "ikiwiki/searching",
noimageinline => 1, linktext => "Help");
IkiWiki::loadindex();
$ENV{HELPLINK}=htmllink("", "", "ikiwiki/searching",
noimageinline => 1, linktext => "Help");
@@
-227,20
+227,21
@@
sub setupfiles () {
"database_dir .\n".
"template_dir ./templates\n");
"database_dir .\n".
"template_dir ./templates\n");
- # Avoid omega interpreting anything in the
misc
template
+ # Avoid omega interpreting anything in the
cgi
template
# as an omegascript command.
# as an omegascript command.
- my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0",
+ 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 $@;
searchform => "", # avoid showing the small search form
);
eval q{use HTML::Entities};
error $@ if $@;
- $
misctemplate=encode_entities($misc
template, '\$');
+ $
template=encode_entities($
template, '\$');
my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl"));
my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl"));
- $
misc
template=~s/\0/$querytemplate/;
+ $template=~s/\0/$querytemplate/;
writefile("query", $config{wikistatedir}."/xapian/templates",
writefile("query", $config{wikistatedir}."/xapian/templates",
- $
misc
template);
+ $template);
$setup=1;
}
}
$setup=1;
}
}