X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b973ed82699903c23b3feeb5e73e1ebd6f587f43..0457dbc773d7d3dadca632a445592a038c9b86b3:/IkiWiki.pm?ds=inline

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7084e9627..15f7bcec0 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -30,6 +30,7 @@ sub defaultconfig () { #{{{
 	wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.x?html?$|\.rss$|\.atom$|.arch-ids/|{arch}/)},
 	wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]]+)\]\]/,
 	wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
+	web_commit_regexp => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
 	verbose => 0,
 	syslog => 0,
 	wikiname => "wiki",
@@ -76,12 +77,14 @@ sub checkconfig () { #{{{
 	}
 	if (defined $config{locale}) {
 		eval q{use POSIX};
+		error($@) if $@;
 		$ENV{LANG} = $config{locale}
 			if POSIX::setlocale(&POSIX::LC_TIME, $config{locale});
 	}
 
 	if ($config{w3mmode}) {
 		eval q{use Cwd q{abs_path}};
+		error($@) if $@;
 		$config{srcdir}=possibly_foolish_untaint(abs_path($config{srcdir}));
 		$config{destdir}=possibly_foolish_untaint(abs_path($config{destdir}));
 		$config{cgiurl}="file:///\$LIB/ikiwiki-w3m.cgi/".$config{cgiurl}
@@ -264,6 +267,7 @@ sub writefile ($$$;$) { #{{{
 	close OUT;
 } #}}}
 
+my %cleared;
 sub will_render ($$;$) { #{{{
 	my $page=shift;
 	my $dest=shift;
@@ -275,11 +279,12 @@ sub will_render ($$;$) { #{{{
 		error("$config{destdir}/$dest independently created, not overwriting with version from $page");
 	}
 
-	if (! $clear) {
+	if (! $clear || $cleared{$page}) {
 		$renderedfiles{$page}=[$dest, grep { $_ ne $dest } @{$renderedfiles{$page}}];
 	}
 	else {
 		$renderedfiles{$page}=[$dest];
+		$cleared{$page}=1;
 	}
 } #}}}
 
@@ -358,6 +363,7 @@ sub displaytime ($) { #{{{
 	my $time=shift;
 
 	eval q{use POSIX};
+	error($@) if $@;
 	# strftime doesn't know about encodings, so make sure
 	# its output is properly treated as utf8
 	return decode_utf8(POSIX::strftime(
@@ -444,10 +450,11 @@ sub linkify ($$$) { #{{{
 } #}}}
 
 my %preprocessing;
-sub preprocess ($$$) { #{{{
+sub preprocess ($$$;$) { #{{{
 	my $page=shift; # the page the data comes from
 	my $destpage=shift; # the page the data will appear in (different for inline)
 	my $content=shift;
+	my $scan=shift;
 
 	my $handle=sub {
 		my $escape=shift;
@@ -457,6 +464,7 @@ sub preprocess ($$$) { #{{{
 			return "[[$command $params]]";
 		}
 		elsif (exists $hooks{preprocess}{$command}) {
+			return "" if $scan && ! $hooks{preprocess}{$command}{scan};
 			# Note: preserve order of params, some plugins may
 			# consider it significant.
 			my @params;
@@ -505,7 +513,7 @@ sub preprocess ($$$) { #{{{
 	return $content;
 } #}}}
 
-sub filter ($$) {
+sub filter ($$) { #{{{
 	my $page=shift;
 	my $content=shift;
 
@@ -514,7 +522,7 @@ sub filter ($$) {
 	});
 
 	return $content;
-}
+} #}}}
 
 sub indexlink () { #{{{
 	return "<a href=\"$config{url}\">$config{wikiname}</a>";
@@ -589,7 +597,8 @@ sub saveindex () { #{{{
 			"ctime=$pagectime{$page} ".
 			"src=$pagesources{$page}";
 		$line.=" dest=$_" foreach @{$renderedfiles{$page}};
-		$line.=" link=$_" foreach @{$links{$page}};
+		my %count;
+		$line.=" link=$_" foreach grep { ++$count{$_} == 1 } @{$links{$page}};
 		if (exists $depends{$page}) {
 			$line.=" depends=".encode_entities($depends{$page}, " \t\n");
 		}