X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ad4760ad783d19af0e115ffa570ec667d09e07ad..0db7de08af694be3aa9f46874ece2b811aaccfa9:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 7b0a718d9..62a9767b9 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -9,7 +9,7 @@ use HTML::Template;
 use lib '.'; # For use without installation, removed by Makefile.
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
-            %renderedfiles %pagesources};
+            %renderedfiles %pagesources %inlinepages};
 
 sub usage () { #{{{
 	die "usage: ikiwiki [options] source dest\n";
@@ -19,8 +19,9 @@ sub getconfig () { #{{{
 	if (! exists $ENV{WRAPPED_OPTIONS}) {
 		%config=(
 			wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
-			wiki_link_regexp => qr/\[\[([^\s\]]+)\]\]/,
-			wiki_file_regexp => qr/(^[-A-Za-z0-9_.\&;:\/+]+$)/,
+			wiki_link_regexp => qr/\[\[(?:([^\s\]\|]+)\|)?([^\s\]]+)\]\]/,
+			wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]+)\]\]/,
+			wiki_file_regexp => qr/(^[-A-Za-z0-9_.:\/+]+$)/,
 			verbose => 0,
 			wikiname => "wiki",
 			default_pageext => ".mdwn",
@@ -33,6 +34,8 @@ sub getconfig () { #{{{
 			anonok => 0,
 			rss => 0,
 			rebuild => 0,
+			refresh => 0,
+			getctime => 0,
 			wrapper => undef,
 			wrappermode => undef,
 			srcdir => undef,
@@ -48,6 +51,8 @@ sub getconfig () { #{{{
 			"wikiname=s" => \$config{wikiname},
 			"verbose|v!" => \$config{verbose},
 			"rebuild!" => \$config{rebuild},
+			"refresh!" => \$config{refresh},
+			"getctime" => \$config{getctime},
 			"wrappermode=i" => \$config{wrappermode},
 			"svn!" => \$config{svn},
 			"anonok!" => \$config{anonok},
@@ -237,7 +242,7 @@ sub bestlink ($$) { #{{{
 sub isinlinableimage ($) { #{{{
 	my $file=shift;
 	
-	$file=~/\.(png|gif|jpg|jpeg)$/;
+	$file=~/\.(png|gif|jpg|jpeg)$/i;
 } #}}}
 
 sub pagetitle ($) { #{{{
@@ -247,11 +252,25 @@ sub pagetitle ($) { #{{{
 	return $page;
 } #}}}
 
-sub htmllink ($$;$$) { #{{{
+sub titlepage ($) { #{{{
+	my $title=shift;
+	$title=~y/ /_/;
+	$title=~s/([^-A-Za-z0-9_:+\/])/"__".ord($1)."__"/eg;
+	return $title;
+} #}}}
+
+sub cgiurl (@) { #{{{
+	my %params=@_;
+
+	return $config{cgiurl}."?".join("&", map "$_=$params{$_}", keys %params);
+} #}}}
+
+sub htmllink ($$;$$$) { #{{{
 	my $page=shift;
 	my $link=shift;
 	my $noimageinline=shift; # don't turn links into inline html images
 	my $forcesubpage=shift; # force a link to a subpage
+	my $linktext=shift; # set to force the link text to something
 
 	my $bestlink;
 	if (! $forcesubpage) {
@@ -261,7 +280,7 @@ sub htmllink ($$;$$) { #{{{
 		$bestlink="$page/".lc($link);
 	}
 
-	my $linktext=pagetitle($link);
+	$linktext=pagetitle(basename($link)) unless defined $linktext;
 	
 	return $linktext if length $bestlink && $page eq $bestlink;
 	
@@ -273,13 +292,15 @@ 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=\"".
+			cgiurl(do => "create", page => $link, from =>$page).
+			"\">?</a>$linktext</span>"
 	}
 	
 	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
 	
 	if (! $noimageinline && isinlinableimage($bestlink)) {
-		return "<img src=\"$bestlink\">";
+		return "<img src=\"$bestlink\" alt=\"$linktext\">";
 	}
 	return "<a href=\"$bestlink\">$linktext</a>";
 } #}}}
@@ -332,6 +353,8 @@ sub loadindex () { #{{{
 			$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];
@@ -346,12 +369,14 @@ sub saveindex () { #{{{
 	open (OUT, ">$config{wikistatedir}/index") || 
 		error("cannot write to $config{wikistatedir}/index: $!");
 	foreach my $page (keys %oldpagemtime) {
+		next unless $oldpagemtime{$page};
 		my $line="mtime=$oldpagemtime{$page} ".
 			"ctime=$pagectime{$page} ".
 			"src=$pagesources{$page} ".
 			"dest=$renderedfiles{$page}";
-		if ($oldpagemtime{$page}) {
-			$line.=" link=$_" foreach @{$links{$page}};
+		$line.=" link=$_" foreach @{$links{$page}};
+		if (exists $inlinepages{$page}) {
+			$line.=" inlinepage=$_" foreach split " ", $inlinepages{$page};
 		}
 		print OUT $line."\n";
 	}
@@ -461,7 +486,13 @@ sub globlist_match ($$) { #{{{
 sub main () { #{{{
 	getconfig();
 	
-	if ($config{setup}) {
+	if ($config{cgi}) {
+		lockwiki();
+		loadindex();
+		require IkiWiki::CGI;
+		cgi();
+	}
+	elsif ($config{setup}) {
 		require IkiWiki::Setup;
 		setup();
 	}
@@ -470,17 +501,12 @@ sub main () { #{{{
 		require IkiWiki::Wrapper;
 		gen_wrapper();
 	}
-	elsif ($config{cgi}) {
-		lockwiki();
-		loadindex();
-		require IkiWiki::CGI;
-		cgi();
-	}
 	else {
 		lockwiki();
 		loadindex();
 		require IkiWiki::Render;
 		rcs_update();
+		rcs_getctime() if $config{getctime};
 		refresh();
 		saveindex();
 	}