web commit by joey

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8f755e8f5a79c354cb604693455a25a010dc5005..4e2caa6cef31435bc026bf70f9b7573d406e46c1 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -127,7 +127,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,21 +149,38 @@ 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;
        }
@@ -197,7 +214,7 @@ sub genpage ($$$) { #{{{
                $template->param(historyurl => $u);
        }
 
-       if ($config{rss}) {
+       if ($config{rss} && $inlinepages{$page}) {
                $template->param(rssurl => rsspage($page));
        }
        
@@ -231,7 +248,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;
@@ -249,16 +266,18 @@ sub genrss ($$$) { #{{{
                my $parentpage=shift;
                my %params=@_;
                
+               return "" if exists $params{archive} && $params{archive} eq 'yes';
+               
                if (! exists $params{show}) {
                        $params{show}=10;
                }
                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 +291,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,
@@ -333,6 +342,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 +356,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")));
                }
@@ -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 &&