X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/7a5ae22e5a5789bf2b1be432cdc7551ab78a5241..7914af53aba0bf109e5a80716f8bd4c9334e035d:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 7148d754e..854d5105e 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -1,8 +1,11 @@
+#!/usr/bin/perl
+
 package IkiWiki;
 
 use warnings;
 use strict;
 use File::Spec;
+use IkiWiki;
 
 sub linkify ($$) { #{{{
 	my $content=shift;
@@ -28,11 +31,19 @@ sub htmlize ($$) { #{{{
 	}
 	
 	if ($type eq '.mdwn') {
-		return Markdown::Markdown($content);
+		$content=Markdown::Markdown($content);
 	}
 	else {
 		error("htmlization of $type not supported");
 	}
+
+	if (exists $hooks{sanitize}) {
+		foreach my $id (keys %{$hooks{sanitize}}) {
+			$content=$hooks{sanitize}{$id}{call}->($content);
+		}
+	}
+	
+	return $content;
 } #}}}
 
 sub backlinks ($) { #{{{
@@ -80,34 +91,26 @@ sub parentlinks ($) { #{{{
 	return @ret;
 } #}}}
 
-sub rsspage ($) { #{{{
-	my $page=shift;
-
-	return $page.".rss";
-} #}}}
-
 sub preprocess ($$) { #{{{
 	my $page=shift;
 	my $content=shift;
 
-	my %commands=(inline => \&preprocess_inline);
-	
 	my $handle=sub {
 		my $escape=shift;
 		my $command=shift;
 		my $params=shift;
 		if (length $escape) {
-			"[[$command $params]]";
+			return "[[$command $params]]";
 		}
-		elsif (exists $commands{$command}) {
+		elsif (exists $hooks{preprocess}{$command}) {
 			my %params;
 			while ($params =~ /(\w+)=\"([^"]+)"(\s+|$)/g) {
 				$params{$1}=$2;
 			}
-			$commands{$command}->($page, %params);
+			return $hooks{preprocess}{$command}{call}->(page => $page, %params);
 		}
 		else {
-			"[[bad directive $command]]";
+			return "[[$command not processed]]";
 		}
 	};
 	
@@ -115,84 +118,34 @@ sub preprocess ($$) { #{{{
 	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;
+sub add_depends ($$) { #{{{
 	my $page=shift;
+	my $globlist=shift;
 	
-	my $file=$pagesources{$page};
-	my $type=pagetype($file);
-	if ($type ne 'unknown') {
-		return htmlize($type, linkify(readfile(srcfile($file)), $parentpage));
+	if (! exists $depends{$page}) {
+		$depends{$page}=$globlist;
 	}
 	else {
-		return "";
+		$depends{$page}=globlist_merge($depends{$page}, $globlist);
 	}
-} #}}}
+} # }}}
 
-sub preprocess_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};
+sub globlist_merge ($$) { #{{{
+	my $a=shift;
+	my $b=shift;
 
 	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"));
-	
-	my @pages;
-	foreach my $page (blog_list($params{pages}, $params{show})) {
-		next if $page eq $parentpage;
-		push @pages, $page;
-		$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;
-	}
-	
-	# TODO: should really add this to renderedfiles and call
-	# check_overwrite, but currently renderedfiles
-	# only supports listing one file per page.
-	if ($config{rss}) {
-		writefile(rsspage($parentpage), $config{destdir},
-			genrss($parentpage, @pages));
+	# Only add negated globs if they are not matched by the other globlist.
+	foreach my $i ((map { [ $a, $_ ] } split(" ", $b)), 
+	               (map { [ $b, $_ ] } split(" ", $a))) {
+		if ($i->[1]=~/^!(.*)/) {
+			if (! globlist_match($1, $i->[0])) {
+				$ret.=" ".$i->[1];
+			}
+		}
+		else {
+			$ret.=" ".$i->[1];
+		}
 	}
 	
 	return $ret;
@@ -221,21 +174,17 @@ sub genpage ($$$) { #{{{
 		$u=~s/\[\[file\]\]/$pagesources{$page}/g;
 		$template->param(historyurl => $u);
 	}
-	if ($config{hyperestraier}) {
-		$template->param(hyperestraierurl => cgiurl());
+	if ($config{discussion}) {
+		$template->param(discussionlink => htmllink($page, "Discussion", 1, 1));
 	}
+	$template->param(headercontent => $config{headercontent});
 
-	if ($config{rss} && $inlinepages{$page}) {
-		$template->param(rssurl => rsspage(basename($page)));
-	}
-	
 	$template->param(
 		title => $title,
 		wikiname => $config{wikiname},
 		parentlinks => [parentlinks($page)],
 		content => $content,
 		backlinks => [backlinks($page)],
-		discussionlink => htmllink($page, "Discussion", 1, 1),
 		mtime => scalar(gmtime($mtime)),
 		styleurl => styleurl($page),
 	);
@@ -243,53 +192,6 @@ sub genpage ($$$) { #{{{
 	return $template->output;
 } #}}}
 
-sub date_822 ($) { #{{{
-	my $time=shift;
-
-	eval q{use POSIX};
-	return POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
-} #}}}
-
-sub absolute_urls ($$) { #{{{
-	# sucky sub because rss sucks
-	my $content=shift;
-	my $url=shift;
-
-	$url=~s/[^\/]+$//;
-	
-	$content=~s/<a\s+href="(?!http:\/\/)([^"]+)"/<a href="$url$1"/ig;
-	$content=~s/<img\s+src="(?!http:\/\/)([^"]+)"/<img src="$url$1"/ig;
-	return $content;
-} #}}}
-
-sub genrss ($@) { #{{{
-	my $page=shift;
-	my @pages=@_;
-	
-	my $url="$config{url}/".htmlpage($page);
-	
-	my $template=HTML::Template->new(blind_cache => 1,
-		filename => "$config{templatedir}/rsspage.tmpl");
-	
-	my @items;
-	foreach my $p (@pages) {
-		push @items, {
-			itemtitle => pagetitle(basename($p)),
-			itemurl => "$config{url}/$renderedfiles{$p}",
-			itempubdate => date_822($pagectime{$p}),
-			itemcontent => absolute_urls(get_inline_content($page, $p), $url),
-		} if exists $renderedfiles{$p};
-	}
-
-	$template->param(
-		title => $config{wikiname},
-		pageurl => $url,
-		items => \@items,
-	);
-	
-	return $template->output;
-} #}}}
-
 sub check_overwrite ($$) { #{{{
 	# Important security check. Make sure to call this before saving
 	# any files to the source directory.
@@ -318,9 +220,14 @@ sub findlinks ($$) { #{{{
 	while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
 		push @links, titlepage($2);
 	}
-	# Discussion links are a special case since they're not in the text
-	# of the page, but on its template.
-	return @links, "$page/discussion";
+	if ($config{discussion}) {
+		# Discussion links are a special case since they're not in the
+		# text of the page, but on its template.
+		return @links, "$page/discussion";
+	}
+	else {
+		return @links;
+	}
 } #}}}
 
 sub render ($) { #{{{
@@ -331,9 +238,18 @@ sub render ($) { #{{{
 	if ($type ne 'unknown') {
 		my $content=readfile($srcfile);
 		my $page=pagename($file);
+		delete $depends{$page};
+		
+		if (exists $hooks{filter}) {
+			foreach my $id (keys %{$hooks{filter}}) {
+				$content=$hooks{filter}{$id}{call}->(
+					page => $page,
+					content => $content
+				);
+			}
+		}
 		
 		$links{$page}=[findlinks($content, $page)];
-		delete $inlinepages{$page};
 		
 		$content=linkify($content, $page);
 		$content=preprocess($page, $content);
@@ -348,6 +264,7 @@ sub render ($) { #{{{
 	else {
 		my $content=readfile($srcfile, 1);
 		$links{$file}=[];
+		delete $depends{$file};
 		check_overwrite("$config{destdir}/$file", $file);
 		writefile($file, $config{destdir}, $content, 1);
 		$oldpagemtime{$file}=time;
@@ -365,57 +282,6 @@ sub prune ($) { #{{{
 	}
 } #}}}
 
-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;
@@ -527,18 +393,19 @@ FILE:		foreach my $file (@files) {
 	}
 
 	# Handle backlinks; if a page has added/removed links, update the
-	# pages it links to. Also handle inlining here.
+	# pages it links to. Also handles rebuilding dependat pages.
 	# 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 || @del) {
 		foreach my $f (@files) {
 			my $p=pagename($f);
-			if (exists $inlinepages{$p}) {
+			if (exists $depends{$p}) {
 				foreach my $file (keys %rendered, @del) {
+					next if $f eq $file;
 					my $page=pagename($file);
-					if (globlist_match($page, $inlinepages{$p})) {
-						debug("rendering $f, which inlines $page");
+					if (globlist_match($page, $depends{$p})) {
+						debug("rendering $f, which depends on $page");
 						render($f);
 						$rendered{$f}=1;
 						last;
@@ -554,8 +421,8 @@ FILE:		foreach my $file (@files) {
 			if (exists $links{$page}) {
 				foreach my $link (map { bestlink($page, $_) } @{$links{$page}}) {
 					if (length $link &&
-					    ! exists $oldlinks{$page} ||
-					    ! grep { $_ eq $link } @{$oldlinks{$page}}) {
+					    (! exists $oldlinks{$page} ||
+					     ! grep { bestlink($page, $_) eq $link } @{$oldlinks{$page}})) {
 						$linkchanged{$link}=1;
 					}
 				}
@@ -563,8 +430,8 @@ FILE:		foreach my $file (@files) {
 			if (exists $oldlinks{$page}) {
 				foreach my $link (map { bestlink($page, $_) } @{$oldlinks{$page}}) {
 					if (length $link &&
-					    ! exists $links{$page} ||
-					    ! grep { $_ eq $link } @{$links{$page}}) {
+					    (! exists $links{$page} || 
+					     ! grep { bestlink($page, $_) eq $link } @{$links{$page}})) {
 						$linkchanged{$link}=1;
 					}
 				}
@@ -580,19 +447,15 @@ FILE:		foreach my $file (@files) {
 		}
 	}
 
-	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 && exists $hooks{delete}) {
+		foreach my $id (keys %{$hooks{delete}}) {
+			$hooks{delete}{$id}{call}->(@del);
 		}
-		if (@del) {
-			estcmd("purge -cl");
+	}
+	if (%rendered && exists $hooks{change}) {
+		foreach my $id (keys %{$hooks{change}}) {
+			$hooks{change}{$id}{call}->(keys %rendered);
 		}
-		
-		debug("generating hyperestraier cgi config");
-		estcfg();
 	}
 } #}}}