X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7b4600df3f8b8c2112a8df6c018d64f04db1ebe8..c438458b8a0f1c9ab7a762380e1f0b8b3db6c67d:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8f755e8f5..1fc047a62 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -9,7 +9,8 @@ sub linkify ($$) { #{{{
 	my $page=shift;
 
 	$content =~ s{(\\?)$config{wiki_link_regexp}}{
-		$1 ? "[[$2]]" : htmllink($page, $2)
+		$2 ? ( $1 ? "[[$2|$3]]" : htmllink($page, titlepage($3), 0, 0, pagetitle($2)))
+		   : ( $1 ? "[[$3]]" :    htmllink($page, titlepage($3)))
 	}eg;
 	
 	return $content;
@@ -127,7 +128,7 @@ sub blog_list ($$) { #{{{
 	}
 
 	@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
-	return @list if @list <= $maxitems;
+	return @list if ! $maxitems || @list <= $maxitems;
 	return @list[0..$maxitems - 1];
 } #}}}
 
@@ -149,26 +150,43 @@ sub postprocess_html_inline { #{{{
 	my $parentpage=shift;
 	my %params=@_;
 	
-	if (! exists $params{show}) {
-		$params{show}=10;
-	}
 	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};
 	
+	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 => "$config{templatedir}/inlinepage.tmpl");
+		filename => (($params{archive} eq "no") 
+				? "$config{templatedir}/inlinepage.tmpl"
+				: "$config{templatedir}/inlinepagetitle.tmpl"));
 	
-	my $ret="";
 	foreach my $page (blog_list($params{pages}, $params{show})) {
+		next if $page eq $parentpage;
 		$template->param(pagelink => htmllink($parentpage, $page));
-		$template->param(content => get_inline_content($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;
 	}
 	
-	return $ret;
+	return "</p>$ret<p>";
 } #}}}
 
 sub genpage ($$$) { #{{{
@@ -184,10 +202,10 @@ sub genpage ($$$) { #{{{
 		filename => "$config{templatedir}/page.tmpl");
 	
 	if (length $config{cgiurl}) {
-		$template->param(editurl => "$config{cgiurl}?do=edit&page=$page");
-		$template->param(prefsurl => "$config{cgiurl}?do=prefs");
+		$template->param(editurl => cgiurl(do => "edit", page => $page));
+		$template->param(prefsurl => cgiurl(do => "prefs"));
 		if ($config{rcs}) {
-			$template->param(recentchangesurl => "$config{cgiurl}?do=recentchanges");
+			$template->param(recentchangesurl => cgiurl(do => "recentchanges"));
 		}
 	}
 
@@ -197,8 +215,8 @@ sub genpage ($$$) { #{{{
 		$template->param(historyurl => $u);
 	}
 
-	if ($config{rss}) {
-		$template->param(rssurl => rsspage($page));
+	if ($config{rss} && $inlinepages{$page}) {
+		$template->param(rssurl => rsspage(basename($page)));
 	}
 	
 	$template->param(
@@ -231,7 +249,7 @@ sub absolute_urls ($$) { #{{{
 	$content=~s/<a\s+href="(?!http:\/\/)([^"]+)"/<a href="$url$1"/ig;
 	$content=~s/<img\s+src="(?!http:\/\/)([^"]+)"/<img src="$url$1"/ig;
 	return $content;
-} #}}}zo
+} #}}}
 
 sub genrss ($$$) { #{{{
 	my $content=shift;
@@ -255,10 +273,10 @@ sub genrss ($$$) { #{{{
 		if (! exists $params{pages}) {
 			return "";
 		}
-		$inlinepages{$parentpage}=$params{pages};
 		
 		$isblog=1;
 		foreach my $page (blog_list($params{pages}, $params{show})) {
+			next if $page eq $parentpage;
 			push @items, {
 				itemtitle => pagetitle(basename($page)),
 				itemurl => "$config{url}/$renderedfiles{$page}",
@@ -272,16 +290,6 @@ sub genrss ($$$) { #{{{
 	
 	$content = postprocess($page, $content, inline => $gen_blog);
 
-	# Regular page gets a feed that is updated every time the
-	# page is changed, so the mtime is encoded in the guid.
-	push @items, {
-		itemtitle => pagetitle(basename($page)),
-		itemguid => "$url?mtime=$mtime",
-		itemurl => $url,
-		itempubdate => date_822($mtime),
-		itemcontent => absolute_urls($content, $url),
-	} unless $isblog;
-	
 	$template->param(
 		title => $config{wikiname},
 		pageurl => $url,
@@ -306,9 +314,9 @@ sub check_overwrite ($$) { #{{{
 } #}}}
 
 sub mtime ($) { #{{{
-	my $page=shift;
+	my $file=shift;
 	
-	return (stat($page))[9];
+	return (stat($file))[9];
 } #}}}
 
 sub findlinks ($$) { #{{{
@@ -317,7 +325,7 @@ sub findlinks ($$) { #{{{
 
 	my @links;
 	while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
-		push @links, lc($1);
+		push @links, titlepage($2);
 	}
 	# Discussion links are a special case since they're not in the text
 	# of the page, but on its template.
@@ -333,6 +341,7 @@ sub render ($) { #{{{
 		my $page=pagename($file);
 		
 		$links{$page}=[findlinks($content, $page)];
+		delete $inlinepages{$page};
 		
 		$content=linkify($content, $page);
 		$content=htmlize($type, $content);
@@ -346,7 +355,7 @@ sub render ($) { #{{{
 		# TODO: should really add this to renderedfiles and call
 		# check_overwrite, as above, but currently renderedfiles
 		# only supports listing one file per page.
-		if ($config{rss}) {
+		if ($config{rss} && exists $inlinepages{$page}) {
 			writefile("$config{destdir}/".rsspage($page),
 				genrss($content, $page, mtime("$config{srcdir}/$file")));
 		}
@@ -408,7 +417,8 @@ sub refresh () { #{{{
 			push @add, $file;
 			$links{$page}=[];
 			$pagesources{$page}=$file;
-			$pagectime{$page}=time unless exists $pagectime{$page};
+			$pagectime{$page}=mtime("$config{srcdir}/$file") 
+				unless exists $pagectime{$page};
 		}
 	}
 	my @del;
@@ -453,25 +463,34 @@ FILE:		foreach my $file (@files) {
 						next FILE;
 					}
 				}
-				if (exists $inlinepages{$page} &&
-				    globlist_match($p, $inlinepages{$page})) {
-					debug("rendering $file, which inlines $p");
-					render($file);
-					$rendered{$file}=1;
-				}
 			}
 		}
 	}
 
-	# handle backlinks; if a page has added/removed links, update the
-	# pages it links to
+	# Handle backlinks; if a page has added/removed links, update the
+	# pages it links to. Also handle inlining here.
 	# 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) {
+	if (%rendered || @del) {
+		foreach my $f (@files) {
+			my $p=pagename($f);
+			if (exists $inlinepages{$p}) {
+				foreach my $file (keys %rendered, @del) {
+					my $page=pagename($file);
+					if (globlist_match($page, $inlinepages{$p})) {
+						debug("rendering $f, which inlines $page");
+						render($f);
+						last;
+					}
+				}
+			}
+		}
+		
 		my %linkchanged;
 		foreach my $file (keys %rendered, @del) {
 			my $page=pagename($file);
+			
 			if (exists $links{$page}) {
 				foreach my $link (map { bestlink($page, $_) } @{$links{$page}}) {
 					if (length $link &&