Rebuild for jessie-backports

[git.ikiwiki.info.git] / IkiWiki / Plugin / pagestats.pm

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 48715bd3e18348fa77da30ba05ceaad0b1e3a9ca..304ddd1c826e95f86d9dbfe139626852149e482c 100644 (file)
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -31,11 +31,30 @@ sub getsetup () {
                },
 }
 
                },
 }
 

+sub linktext ($%) {
+       # Return the text of the link to a tag, depending on option linktext.
+       my ($page, %params) = @_;
+       if (exists $params{show} &&
+               exists $pagestate{$page} &&
+               exists $pagestate{$page}{meta}{$params{show}}) {
+               return $pagestate{$page}{meta}{$params{show}};
+       }
+       else {
+               return undef;
+       }
+}
+

 sub preprocess (@) {
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        my $style = ($params{style} or 'cloud');
 sub preprocess (@) {
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        my $style = ($params{style} or 'cloud');

-       
+
+       # Backwards compatibility
+       if (defined $params{show} && $params{show} =~ m/^\d+$/) {
+               $params{limit} = $params{show};
+               delete $params{show};
+       }
+

        my %counts;
        my $max = 0;
        foreach my $page (pagespec_match_list($params{page}, $params{pages},
        my %counts;
        my $max = 0;
        foreach my $page (pagespec_match_list($params{page}, $params{pages},


@@ -64,11 +83,11 @@ sub preprocess (@) {
                $max = $counts{$page} if $counts{$page} > $max;
        }
 
                $max = $counts{$page} if $counts{$page} > $max;
        }
 

-       if (exists $params{show}) {
+       if (exists $params{limit}) {

                my $i=0;
                my %show;
                my $i=0;
                my %show;

-               foreach my $key (sort { $counts{$b} <=> $counts{$a} } keys %counts) {
-                       last if ++$i > $params{show};
+               foreach my $key (sort { $counts{$b} <=> $counts{$a} || $a cmp $b } keys %counts) {
+                       last if ++$i > $params{limit};

                        $show{$key}=$counts{$key};
                }
                %counts=%show;
                        $show{$key}=$counts{$key};
                }
                %counts=%show;


@@ -78,10 +97,10 @@ sub preprocess (@) {
                return "<table class='".(exists $params{class} ? $params{class} : "pageStats")."'>\n".
                        join("\n", map {
                                "<tr><td>".
                return "<table class='".(exists $params{class} ? $params{class} : "pageStats")."'>\n".
                        join("\n", map {
                                "<tr><td>".

-                               htmllink($params{page}, $params{destpage}, $_, noimageinline => 1).
+                               htmllink($params{page}, $params{destpage}, $_, noimageinline => 1, linktext => linktext($_, %params)).

                                "</td><td>".$counts{$_}."</td></tr>"
                        }
                                "</td><td>".$counts{$_}."</td></tr>"
                        }

-                       sort { $counts{$b} <=> $counts{$a} } keys %counts).
+                       sort { $counts{$b} <=> $counts{$a} || $a cmp $b } keys %counts).

                        "\n</table>\n" ;
        }
        else {
                        "\n</table>\n" ;
        }
        else {


@@ -101,13 +120,13 @@ sub preprocess (@) {
                        
                        $res.="<li>" if $style eq 'list';
                        $res .= "<span class=\"$class\">".
                        
                        $res.="<li>" if $style eq 'list';
                        $res .= "<span class=\"$class\">".

-                               htmllink($params{page}, $params{destpage}, $page).
+                                                       htmllink($params{page}, $params{destpage}, $page, linktext => linktext($page, %params)).

                                "</span>\n";
                        $res.="</li>" if $style eq 'list';
 
                }
                if ($style eq 'list') {
                                "</span>\n";
                        $res.="</li>" if $style eq 'list';
 
                }
                if ($style eq 'list') {

-                       $res = "</ul>\n";
+                       $res .= "</ul>\n";

                }
                else {
                        $res .= "</div>\n";
                }
                else {
                        $res .= "</div>\n";