disable pagecount here, sorta of excessive since the bug has been done

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

diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 9e885741e073bc4ded2e3947366ea6265d8249db..d2e5c23788678efb7819e10c59964bd852663e06 100644 (file)
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -3,14 +3,23 @@ package IkiWiki::Plugin::postsparkline;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {

        IkiWiki::loadplugin('sparkline');
        IkiWiki::loadplugin('sparkline');

+       hook(type => "getsetup", id => "postsparkline", call => \&getsetup);

        hook(type => "preprocess", id => "postsparkline", call => \&preprocess);
        hook(type => "preprocess", id => "postsparkline", call => \&preprocess);

-} # }}}
+}
+
+sub getsetup () {
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}

 
 

-sub preprocess (@) { #{{{
+sub preprocess (@) {

        my %params=@_;
 
        if (! exists $params{max}) {
        my %params=@_;
 
        if (! exists $params{max}) {


@@ -29,31 +38,26 @@ sub preprocess (@) { #{{{
        }
 
        if (! exists $params{formula}) {
        }
 
        if (! exists $params{formula}) {

-               return "[[postsparkline ".gettext("missing formula")."]]";
+               error gettext("missing formula")

        }
        my $formula=$params{formula};
        $formula=~s/[^a-zA-Z0-9]*//g;
        $formula=IkiWiki::possibly_foolish_untaint($formula);
        if (! length $formula ||
            ! IkiWiki::Plugin::postsparkline::formula->can($formula)) {
        }
        my $formula=$params{formula};
        $formula=~s/[^a-zA-Z0-9]*//g;
        $formula=IkiWiki::possibly_foolish_untaint($formula);
        if (! length $formula ||
            ! IkiWiki::Plugin::postsparkline::formula->can($formula)) {

-               return "[[postsparkline ".gettext("unknown formula")."]]";
+               error gettext("unknown formula");

        }
 
        add_depends($params{page}, $params{pages});
 
        }
 
        add_depends($params{page}, $params{pages});
 

-       my @list;
-       foreach my $page (keys %pagesources) {
-               next if $page eq $params{page};
-               if (pagespec_match($page, $params{pages}, location => $params{page})) {
-                       push @list, $page;
-               }
-       }
-       
-       @list = sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } @list;
+       my @list=sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } 
+               pagespec_match_list(
+                       [ grep { $_ ne $params{page} } keys %pagesources],
+                       $params{pages}, location => $params{page});

 
        my @data=eval qq{IkiWiki::Plugin::postsparkline::formula::$formula(\\\%params, \@list)};
        if ($@) {
 
        my @data=eval qq{IkiWiki::Plugin::postsparkline::formula::$formula(\\\%params, \@list)};
        if ($@) {

-               return "[[postsparkline error $@]]";
+               error $@;

        }
 
        if (! @data) {
        }
 
        if (! @data) {


@@ -69,7 +73,7 @@ sub preprocess (@) { #{{{
        delete $params{color};
        return IkiWiki::Plugin::sparkline::preprocess(%params, 
                map { $_.$color => "" } reverse @data);
        delete $params{color};
        return IkiWiki::Plugin::sparkline::preprocess(%params, 
                map { $_.$color => "" } reverse @data);

-} # }}}
+}

 
 sub perfoo ($@) {
        my $sub=shift;
 
 sub perfoo ($@) {
        my $sub=shift;