X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ca366fc9025197a5d32034a446dc35b776101d78..5951c1dc8220cbc09e6bdda09bae92aa4e3236e3:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 5c708919a..77c7744f9 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -8,7 +8,8 @@ use File::Spec;
 use HTML::Template;
 use lib '.'; # For use without installation, removed by Makefile.
 
-use vars qw{%config %links %oldlinks %oldpagemtime %renderedfiles %pagesources};
+use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
+            %renderedfiles %pagesources %inlinepages};
 
 sub usage () { #{{{
 	die "usage: ikiwiki [options] source dest\n";
@@ -19,6 +20,7 @@ sub getconfig () { #{{{
 		%config=(
 			wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
 			wiki_link_regexp => qr/\[\[([^\s\]]+)\]\]/,
+			wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]+)\]\]/,
 			wiki_file_regexp => qr/(^[-A-Za-z0-9_.\&;:\/+]+$)/,
 			verbose => 0,
 			wikiname => "wiki",
@@ -272,7 +274,7 @@ sub htmllink ($$;$$) { #{{{
 		$bestlink=htmlpage($bestlink);
 	}
 	if (! grep { $_ eq $bestlink } values %renderedfiles) {
-		return "<a href=\"$config{cgiurl}?do=create&page=$link&from=$page\">?</a>$linktext"
+		return "<span><a href=\"$config{cgiurl}?do=create&page=$link&from=$page\">?</a>$linktext</span>"
 	}
 	
 	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
@@ -316,13 +318,26 @@ sub loadindex () { #{{{
 	while (<IN>) {
 		$_=possibly_foolish_untaint($_);
 		chomp;
-		my ($mtime, $file, $rendered, @links)=split(' ', $_);
-		my $page=pagename($file);
-		$pagesources{$page}=$file;
-		$oldpagemtime{$page}=$mtime;
-		$oldlinks{$page}=[@links];
-		$links{$page}=[@links];
-		$renderedfiles{$page}=$rendered;
+		my %items;
+		$items{link}=[];
+		foreach my $i (split(/ /, $_)) {
+			my ($item, $val)=split(/=/, $i, 2);
+			push @{$items{$item}}, $val;
+		}
+
+		next unless exists $items{src}; # skip bad lines for now
+
+		my $page=pagename($items{src}[0]);
+		if (! $config{rebuild}) {
+			$pagesources{$page}=$items{src}[0];
+			$oldpagemtime{$page}=$items{mtime}[0];
+			$oldlinks{$page}=[@{$items{link}}];
+			$links{$page}=[@{$items{link}}];
+			$inlinepages{$page}=join(" ", @{$items{inlinepage}})
+				if exists $items{inlinepage};
+			$renderedfiles{$page}=$items{dest}[0];
+		}
+		$pagectime{$page}=$items{ctime}[0];
 	}
 	close IN;
 } #}}}
@@ -334,9 +349,16 @@ sub saveindex () { #{{{
 	open (OUT, ">$config{wikistatedir}/index") || 
 		error("cannot write to $config{wikistatedir}/index: $!");
 	foreach my $page (keys %oldpagemtime) {
-		print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ".
-	        	join(" ", @{$links{$page}})."\n"
-				if $oldpagemtime{$page};
+		next unless $oldpagemtime{$page};
+		my $line="mtime=$oldpagemtime{$page} ".
+			"ctime=$pagectime{$page} ".
+			"src=$pagesources{$page} ".
+			"dest=$renderedfiles{$page}";
+		$line.=" link=$_" foreach @{$links{$page}};
+		if (exists $inlinepages{$page}) {
+			$line.=" inlinepage=$_" foreach split " ", $inlinepages{$page};
+		}
+		print OUT $line."\n";
 	}
 	close OUT;
 } #}}}
@@ -455,12 +477,13 @@ sub main () { #{{{
 	}
 	elsif ($config{cgi}) {
 		lockwiki();
+		loadindex();
 		require IkiWiki::CGI;
 		cgi();
 	}
 	else {
 		lockwiki();
-		loadindex() unless $config{rebuild};
+		loadindex();
 		require IkiWiki::Render;
 		rcs_update();
 		refresh();