web commit by KarlMW

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 80c99e4300bd85022fbe8a9b7cdb26d2e7f0b3b1..92993fd95faf4003961062d9773f7f21d16526a1 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -30,10 +30,9 @@ sub backlinks ($) { #{{{
        calculate_backlinks();
 
        my @links;
-       return unless $backlinks{$page};
        foreach my $p (keys %{$backlinks{$page}}) {
-               my $href=abs2rel(htmlpage($p), dirname($page));
-                       
+               my $href=urlto($p, $page);
+                
                # Trim common dir prefixes from both pages.
                my $p_trimmed=$p;
                my $page_trimmed=$page;
@@ -45,8 +44,7 @@ sub backlinks ($) { #{{{
                               
                push @links, { url => $href, page => pagetitle($p_trimmed) };
        }
-
-       return sort { $a->{page} cmp $b->{page} } @links;
+       return @links;
 } #}}}
 
 sub parentlinks ($) { #{{{
@@ -55,18 +53,14 @@ sub parentlinks ($) { #{{{
        my @ret;
        my $pagelink="";
        my $path="";
-       my $skip=1;
+       my $title=$config{wikiname};
+       
        return if $page eq 'index'; # toplevel
-       foreach my $dir (reverse split("/", $page)) {
-               if (! $skip) {
-                       $path.="../";
-                       unshift @ret, { url => $path.htmlpage($dir), page => pagetitle($dir) };
-               }
-               else {
-                       $skip=0;
-               }
+       foreach my $dir (split("/", $page)) {
+               push @ret, { url => urlto($path, $page), page => $title };
+               $path.="/".$dir;
+               $title=pagetitle($dir);
        }
-       unshift @ret, { url => length $path ? $path : ".", page => $config{wikiname} };
        return @ret;
 } #}}}
 
@@ -79,7 +73,7 @@ sub genpage ($$$) { #{{{
        my $actions=0;
 
        if (length $config{cgiurl}) {
-               $template->param(editurl => cgiurl(do => "edit", page => $page));
+               $template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));
                $template->param(prefsurl => cgiurl(do => "prefs"));
                if ($config{rcs}) {
                        $template->param(recentchangesurl => cgiurl(do => "recentchanges"));
@@ -107,6 +101,17 @@ sub genpage ($$$) { #{{{
                $template->param(have_actions => 1);
        }
 
+       my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page);
+       my ($backlinks, $more_backlinks);
+       if (@backlinks <= $config{numbacklinks} || ! $config{numbacklinks}) {
+               $backlinks=\@backlinks;
+               $more_backlinks=[];
+       }
+       else {
+               $backlinks=[@backlinks[0..$config{numbacklinks}-1]];
+               $more_backlinks=[@backlinks[$config{numbacklinks}..$#backlinks]];
+       }
+
        $template->param(
                title => $page eq 'index' 
                        ? $config{wikiname} 
@@ -114,7 +119,8 @@ sub genpage ($$$) { #{{{
                wikiname => $config{wikiname},
                parentlinks => [parentlinks($page)],
                content => $content,
-               backlinks => [backlinks($page)],
+               backlinks => $backlinks,
+               more_backlinks => $more_backlinks,
                mtime => displaytime($mtime),
                baseurl => baseurl($page),
        );
@@ -192,7 +198,6 @@ sub render ($) { #{{{
                
                writefile(htmlpage($page), $config{destdir},
                        genpage($page, $content, mtime($srcfile)));
-               $oldpagemtime{$page}=time;
        }
        else {
                my $srcfd=readfile($srcfile, 1, 1);
@@ -218,7 +223,6 @@ sub render ($) { #{{{
                                }
                        }
                });
-               $oldpagemtime{$file}=time;
        }
 } #}}}
 
@@ -294,7 +298,7 @@ sub refresh () { #{{{
        foreach my $file (@files) {
                my $page=pagename($file);
                $pagesources{$page}=$file;
-               if (! $oldpagemtime{$page}) {
+               if (! $pagemtime{$page}) {
                        push @add, $file;
                        $pagecase{lc $page}=$page;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {
@@ -306,36 +310,41 @@ sub refresh () { #{{{
                }
        }
        my @del;
-       foreach my $page (keys %oldpagemtime) {
+       foreach my $page (keys %pagemtime) {
                if (! $exists{$page}) {
                        debug(sprintf(gettext("removing old page %s"), $page));
                        push @del, $pagesources{$page};
                        $links{$page}=[];
                        $renderedfiles{$page}=[];
-                       $oldpagemtime{$page}=0;
+                       $pagemtime{$page}=0;
                        prune($config{destdir}."/".$_)
                                foreach @{$oldrenderedfiles{$page}};
                        delete $pagesources{$page};
                }
        }
 
-       # scan changed and new files
-       my @changed;
+       # find changed and new files
+       my @needsbuild;
        foreach my $file (@files) {
                my $page=pagename($file);
                
-               if (! exists $oldpagemtime{$page} ||
-                   mtime(srcfile($file)) > $oldpagemtime{$page} ||
+               my $mtime=mtime(srcfile($file));
+               if (! exists $pagemtime{$page} ||
+                   $mtime > $pagemtime{$page} ||
                    $forcerebuild{$page}) {
-                       debug(sprintf(gettext("scanning %s"), $file));
-                       push @changed, $file;
-                       scan($file);
+                       $pagemtime{$page}=$mtime;
+                       push @needsbuild, $file;
                }
        }
-       calculate_backlinks();
+       run_hooks(needsbuild => sub { shift->(\@needsbuild) });
 
-       # render changed and new pages
-       foreach my $file (@changed) {
+       # scan and rendder files
+       foreach my $file (@needsbuild) {
+               debug(sprintf(gettext("scanning %s"), $file));
+               scan($file);
+       }
+       calculate_backlinks();
+       foreach my $file (@needsbuild) {
                debug(sprintf(gettext("rendering %s"), $file));
                render($file);
                $rendered{$file}=1;
@@ -364,7 +373,7 @@ sub refresh () { #{{{
                                foreach my $file (keys %rendered, @del) {
                                        next if $f eq $file;
                                        my $page=pagename($file);
-                                       if (pagespec_match($page, $depends{$p}, $p)) {
+                                       if (pagespec_match($page, $depends{$p}, location => $p)) {
                                                debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));
                                                render($f);
                                                $rendered{$f}=1;