my $page=shift;
$content =~ s{(\\?)$config{wiki_link_regexp}}{
- $1 ? "[[$2]]" : htmllink($page, $2)
+ $2 ? ( $1 ? "[[$2|$3]]" : htmllink($page, titlepage($3), 0, 0, pagetitle($2)))
+ : ( $1 ? "[[$3]]" : htmllink($page, titlepage($3)))
}eg;
return $content;
return $page.".rss";
} #}}}
+sub postprocess { #{{{
+ # Takes content to postprocess followed by a list of postprocessor
+ # commands and subroutine references to run for the commands.
+ my $page=shift;
+ my $content=shift;
+ my %commands=@_;
+
+ my $handle=sub {
+ my $escape=shift;
+ my $command=shift;
+ my $params=shift;
+ if (length $escape) {
+ "[[$command $params]]";
+ }
+ elsif (exists $commands{$command}) {
+ my %params;
+ while ($params =~ /(\w+)=\"([^"]+)"(\s+|$)/g) {
+ $params{$1}=$2;
+ }
+ $commands{$command}->($page, %params);
+ }
+ else {
+ "[[bad directive $command]]";
+ }
+ };
+
+ $content =~ s{(\\?)$config{wiki_processor_regexp}}{$handle->($1, $2, $3)}eg;
+ return $content;
+} #}}}
+
+sub blog_list ($$) { #{{{
+ my $globlist=shift;
+ my $maxitems=shift;
+
+ my @list;
+ foreach my $page (keys %pagesources) {
+ if (globlist_match($page, $globlist)) {
+ push @list, $page;
+ }
+ }
+
+ @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
+ return @list if ! $maxitems || @list <= $maxitems;
+ return @list[0..$maxitems - 1];
+} #}}}
+
+sub get_inline_content ($$) { #{{{
+ my $parentpage=shift;
+ my $page=shift;
+
+ my $file=$pagesources{$page};
+ my $type=pagetype($file);
+ if ($type ne 'unknown') {
+ return htmlize($type, linkify(readfile(srcfile($file)), $parentpage));
+ }
+ else {
+ return "";
+ }
+} #}}}
+
+sub postprocess_html_inline { #{{{
+ my $parentpage=shift;
+ my %params=@_;
+
+ if (! exists $params{pages}) {
+ return "";
+ }
+ if (! exists $params{archive}) {
+ $params{archive}="no";
+ }
+ if (! exists $params{show} && $params{archive} eq "no") {
+ $params{show}=10;
+ }
+ $inlinepages{$parentpage}=$params{pages};
+
+ my $ret="";
+
+ if (exists $params{rootpage}) {
+ my $formtemplate=HTML::Template->new(blind_cache => 1,
+ filename => "$config{templatedir}/blogpost.tmpl");
+ $formtemplate->param(cgiurl => $config{cgiurl});
+ $formtemplate->param(rootpage => $params{rootpage});
+ my $form=$formtemplate->output;
+ $ret.=$form;
+ }
+
+ my $template=HTML::Template->new(blind_cache => 1,
+ filename => (($params{archive} eq "no")
+ ? "$config{templatedir}/inlinepage.tmpl"
+ : "$config{templatedir}/inlinepagetitle.tmpl"));
+
+ foreach my $page (blog_list($params{pages}, $params{show})) {
+ next if $page eq $parentpage;
+ $template->param(pagelink => htmllink($parentpage, $page));
+ $template->param(content => get_inline_content($parentpage, $page))
+ if $params{archive} eq "no";
+ $template->param(ctime => scalar(gmtime($pagectime{$page})));
+ $ret.=$template->output;
+ }
+
+ return "</p>$ret<p>";
+} #}}}
+
sub genpage ($$$) { #{{{
my $content=shift;
my $page=shift;
my $mtime=shift;
+ $content = postprocess($page, $content, inline => \&postprocess_html_inline);
+
my $title=pagetitle(basename($page));
my $template=HTML::Template->new(blind_cache => 1,
filename => "$config{templatedir}/page.tmpl");
if (length $config{cgiurl}) {
- $template->param(editurl => "$config{cgiurl}?do=edit&page=$page");
- $template->param(prefsurl => "$config{cgiurl}?do=prefs");
+ $template->param(editurl => cgiurl(do => "edit", page => $page));
+ $template->param(prefsurl => cgiurl(do => "prefs"));
if ($config{rcs}) {
- $template->param(recentchangesurl => "$config{cgiurl}?do=recentchanges");
+ $template->param(recentchangesurl => cgiurl(do => "recentchanges"));
}
}
$u=~s/\[\[file\]\]/$pagesources{$page}/g;
$template->param(historyurl => $u);
}
+ if ($config{hyperestraier}) {
+ $template->param(hyperestraierurl => cgiurl());
+ }
- if ($config{rss}) {
- $template->param(rssurl => rsspage($page));
+ if ($config{rss} && $inlinepages{$page}) {
+ $template->param(rssurl => rsspage(basename($page)));
}
$template->param(
backlinks => [backlinks($page)],
discussionlink => htmllink($page, "Discussion", 1, 1),
mtime => scalar(gmtime($mtime)),
+ styleurl => styleurl($page),
);
return $template->output;
} #}}}
sub absolute_urls ($$) { #{{{
+ # sucky sub because rss sucks
my $content=shift;
my $url=shift;
$url=~s/[^\/]+$//;
- $content=~s{<a\s+href="([^"]+)"}{
- "<a href=\"$url$1\""
- }ieg;
- $content=~s{<img\s+src="([^"]+)"}{
- "<img src=\"$url$1\""
- }ieg;
+ $content=~s/<a\s+href="(?!http:\/\/)([^"]+)"/<a href="$url$1"/ig;
+ $content=~s/<img\s+src="(?!http:\/\/)([^"]+)"/<img src="$url$1"/ig;
return $content;
} #}}}
my $content=shift;
my $page=shift;
my $mtime=shift;
-
+
my $url="$config{url}/".htmlpage($page);
my $template=HTML::Template->new(blind_cache => 1,
filename => "$config{templatedir}/rsspage.tmpl");
- # Regular page gets a feed that is updated every time the
- # page is changed, so the mtime is encoded in the guid.
- my @items=(
- {
- itemtitle => pagetitle(basename($page)),
- itemguid => "$url?mtime=$mtime",
- itemurl => $url,
- itempubdate => date_822($mtime),
- itemcontent => absolute_urls($content, $url), # rss sucks
- },
- );
+ my @items;
+ my $isblog=0;
+ my $gen_blog=sub {
+ my $parentpage=shift;
+ my %params=@_;
+
+ if (! exists $params{show}) {
+ $params{show}=10;
+ }
+ if (! exists $params{pages}) {
+ return "";
+ }
+
+ $isblog=1;
+ foreach my $page (blog_list($params{pages}, $params{show})) {
+ next if $page eq $parentpage;
+ push @items, {
+ itemtitle => pagetitle(basename($page)),
+ itemurl => "$config{url}/$renderedfiles{$page}",
+ itempubdate => date_822($pagectime{$page}),
+ itemcontent => absolute_urls(get_inline_content($parentpage, $page), $url),
+ } if exists $renderedfiles{$page};
+ }
+
+ return "";
+ };
+ $content = postprocess($page, $content, inline => $gen_blog);
+
$template->param(
title => $config{wikiname},
pageurl => $url,
} #}}}
sub mtime ($) { #{{{
- my $page=shift;
+ my $file=shift;
- return (stat($page))[9];
+ return (stat($file))[9];
} #}}}
sub findlinks ($$) { #{{{
my @links;
while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
- push @links, lc($1);
+ push @links, titlepage($2);
}
# Discussion links are a special case since they're not in the text
# of the page, but on its template.
my $file=shift;
my $type=pagetype($file);
- my $content=readfile("$config{srcdir}/$file");
+ my $srcfile=srcfile($file);
+ my $content=readfile($srcfile);
if ($type ne 'unknown') {
my $page=pagename($file);
$links{$page}=[findlinks($content, $page)];
+ delete $inlinepages{$page};
$content=linkify($content, $page);
$content=htmlize($type, $content);
check_overwrite("$config{destdir}/".htmlpage($page), $page);
- writefile("$config{destdir}/".htmlpage($page),
- genpage($content, $page, mtime("$config{srcdir}/$file")));
+ writefile(htmlpage($page), $config{destdir},
+ genpage($content, $page, mtime($srcfile)));
$oldpagemtime{$page}=time;
$renderedfiles{$page}=htmlpage($page);
# TODO: should really add this to renderedfiles and call
# check_overwrite, as above, but currently renderedfiles
# only supports listing one file per page.
- if ($config{rss}) {
- writefile("$config{destdir}/".rsspage($page),
- genrss($content, $page, mtime("$config{srcdir}/$file")));
+ if ($config{rss} && exists $inlinepages{$page}) {
+ writefile(rsspage($page), $config{destdir},
+ genrss($content, $page, mtime($srcfile)));
}
}
else {
$links{$file}=[];
check_overwrite("$config{destdir}/$file", $file);
- writefile("$config{destdir}/$file", $content);
+ writefile($file, $config{destdir}, $content);
$oldpagemtime{$file}=time;
$renderedfiles{$file}=$file;
}
}
} #}}}
+sub estcfg () { #{{{
+ my $estdir="$config{wikistatedir}/hyperestraier";
+ my $cgi=basename($config{cgiurl});
+ $cgi=~s/\..*$//;
+ open(TEMPLATE, ">$estdir/$cgi.tmpl") ||
+ error("write $estdir/$cgi.tmpl: $!");
+ print TEMPLATE misctemplate("search",
+ "<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n");
+ close TEMPLATE;
+ open(TEMPLATE, ">$estdir/$cgi.conf") ||
+ error("write $estdir/$cgi.conf: $!");
+ my $template=HTML::Template->new(
+ filename => "$config{templatedir}/estseek.conf"
+ );
+ eval q{use Cwd 'abs_path'};
+ $template->param(
+ index => $estdir,
+ tmplfile => "$estdir/$cgi.tmpl",
+ destdir => abs_path($config{destdir}),
+ url => $config{url},
+ );
+ print TEMPLATE $template->output;
+ close TEMPLATE;
+ $cgi="$estdir/".basename($config{cgiurl});
+ unlink($cgi);
+ symlink("/usr/lib/estraier/estseek.cgi", $cgi) ||
+ error("symlink $cgi: $!");
+} # }}}
+
+sub estcmd ($;@) { #{{{
+ my @params=split(' ', shift);
+ push @params, "-cl", "$config{wikistatedir}/hyperestraier";
+ if (@_) {
+ push @params, "-";
+ }
+
+ my $pid=open(CHILD, "|-");
+ if ($pid) {
+ # parent
+ foreach (@_) {
+ print CHILD "$_\n";
+ }
+ close(CHILD) || error("estcmd @params exited nonzero: $?");
+ }
+ else {
+ # child
+ open(STDOUT, "/dev/null"); # shut it up (closing won't work)
+ exec("estcmd", @params) || error("can't run estcmd");
+ }
+} #}}}
+
sub refresh () { #{{{
# find existing pages
my %exists;
no_chdir => 1,
wanted => sub {
if (/$config{wiki_file_prune_regexp}/) {
- no warnings 'once';
$File::Find::prune=1;
- use warnings "all";
}
elsif (! -d $_ && ! -l $_) {
my ($f)=/$config{wiki_file_regexp}/; # untaint
}
},
}, $config{srcdir});
+ find({
+ no_chdir => 1,
+ wanted => sub {
+ if (/$config{wiki_file_prune_regexp}/) {
+ $File::Find::prune=1;
+ }
+ elsif (! -d $_ && ! -l $_) {
+ my ($f)=/$config{wiki_file_regexp}/; # untaint
+ if (! defined $f) {
+ warn("skipping bad filename $_\n");
+ }
+ else {
+ # Don't add files that are in the
+ # srcdir.
+ $f=~s/^\Q$config{underlaydir}\E\/?//;
+ if (! -e "$config{srcdir}/$f" &&
+ ! -l "$config{srcdir}/$f") {
+ push @files, $f;
+ $exists{pagename($f)}=1;
+ }
+ }
+ }
+ },
+ }, $config{underlaydir});
my %rendered;
foreach my $file (@files) {
my $page=pagename($file);
if (! $oldpagemtime{$page}) {
- debug("new page $page");
+ debug("new page $page") unless exists $pagectime{$page};
push @add, $file;
$links{$page}=[];
$pagesources{$page}=$file;
+ $pagectime{$page}=mtime(srcfile($file))
+ unless exists $pagectime{$page};
}
}
my @del;
my $page=pagename($file);
if (! exists $oldpagemtime{$page} ||
- mtime("$config{srcdir}/$file") > $oldpagemtime{$page}) {
+ mtime(srcfile($file)) > $oldpagemtime{$page}) {
debug("rendering changed file $file");
render($file);
$rendered{$file}=1;
}
# if any files were added or removed, check to see if each page
- # needs an update due to linking to them
+ # needs an update due to linking to them or inlining them.
# TODO: inefficient; pages may get rendered above and again here;
# problem is the bestlink may have changed and we won't know until
# now
}
}
- # handle backlinks; if a page has added/removed links, update the
- # pages it links to
+ # Handle backlinks; if a page has added/removed links, update the
+ # pages it links to. Also handle inlining here.
# TODO: inefficient; pages may get rendered above and again here;
# problem is the backlinks could be wrong in the first pass render
# above
- if (%rendered) {
+ if (%rendered || @del) {
+ foreach my $f (@files) {
+ my $p=pagename($f);
+ if (exists $inlinepages{$p}) {
+ foreach my $file (keys %rendered, @del) {
+ my $page=pagename($file);
+ if (globlist_match($page, $inlinepages{$p})) {
+ debug("rendering $f, which inlines $page");
+ render($f);
+ $rendered{$f}=1;
+ last;
+ }
+ }
+ }
+ }
+
my %linkchanged;
foreach my $file (keys %rendered, @del) {
my $page=pagename($file);
+
if (exists $links{$page}) {
foreach my $link (map { bestlink($page, $_) } @{$links{$page}}) {
if (length $link &&
if (defined $linkfile) {
debug("rendering $linkfile, to update its backlinks");
render($linkfile);
+ $rendered{$linkfile}=1;
}
}
}
+
+ if ($config{hyperestraier} && (%rendered || @del)) {
+ debug("updating hyperestraier search index");
+ if (%rendered) {
+ estcmd("gather -cm -bc -cl -sd",
+ map { $config{destdir}."/".$renderedfiles{pagename($_)} }
+ keys %rendered);
+ }
+ if (@del) {
+ estcmd("purge -cl");
+ }
+
+ debug("generating hyperestraier cgi config");
+ estcfg();
+ }
} #}}}
1
sipb-www / ikiwiki.git / blobdiff