X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/db3b72c4822cf9057460d47654c35f0a5115139e..a829378f1da89626ed5a52aaafb57e88cdef4f79:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index da5a5510b..47fbe7a61 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -11,6 +11,7 @@ my %backlinks;
 my $backlinks_calculated=0;
 
 sub calculate_backlinks () { #{{{
+	return if $backlinks_calculated;
 	%backlinks=();
 	foreach my $page (keys %links) {
 		foreach my $link (@{$links{$page}}) {
@@ -26,7 +27,7 @@ sub calculate_backlinks () { #{{{
 sub backlinks ($) { #{{{
 	my $page=shift;
 
-	calculate_backlinks() unless $backlinks_calculated;
+	calculate_backlinks();
 
 	my @links;
 	return unless $backlinks{$page};
@@ -163,6 +164,9 @@ sub scan ($) { #{{{
 		# Preprocess in scan-only mode.
 		preprocess($page, $page, $content, 1);
 	}
+	else {
+		will_render($file, $file, 1);
+	}
 } #}}}
 
 sub render ($) { #{{{
@@ -209,6 +213,7 @@ sub refresh () { #{{{
 	my %exists;
 	my @files;
 	eval q{use File::Find};
+	error($@) if $@;
 	find({
 		no_chdir => 1,
 		wanted => sub {
@@ -300,6 +305,7 @@ sub refresh () { #{{{
 			scan($file);
 		}
 	}
+	calculate_backlinks();
 
 	# render changed and new pages
 	foreach my $file (@changed) {
@@ -308,22 +314,16 @@ sub refresh () { #{{{
 		$rendered{$file}=1;
 	}
 	
-	# if any files were added or removed, check to see if each page
-	# needs an update due to linking to them or inlining them
+	# rebuild pages that link to added or removed pages
 	if (@add || @del) {
-FILE:		foreach my $file (@files) {
-			next if $rendered{$file};
-			my $page=pagename($file);
-			foreach my $f (@add, @del) {
-				my $p=pagename($f);
-				foreach my $link (@{$links{$page}}) {
-					if (bestlink($page, $link) eq $p) {
-		   				debug("rendering $file, which links to $p");
-						render($file);
-						$rendered{$file}=1;
-						next FILE;
-					}
-				}
+		foreach my $f (@add, @del) {
+			my $p=pagename($f);
+			foreach my $page (keys %{$backlinks{$p}}) {
+				my $file=$pagesources{$page};
+				next if $rendered{$file};
+		   		debug("rendering $file, which links to $p");
+				render($file);
+				$rendered{$file}=1;
 			}
 		}
 	}