X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2e1670a821ac2582ac8c65f3ec39bfa64d27577a..be092e56395fd70df71a062492e97794650ebf40:/IkiWiki/Plugin/postsparkline.pm?ds=inline

diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 6f7558bc4..1753e4cf9 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -5,12 +5,21 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	IkiWiki::loadplugin('sparkline');
+	hook(type => "getsetup", id => "postsparkline", call => \&getsetup);
 	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}) {
@@ -29,14 +38,14 @@ sub preprocess (@) { #{{{
 	}
 
 	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)) {
-		return "[[postsparkline ".gettext("unknown formula")."]]";
+		error gettext("unknown formula");
 	}
 
 	add_depends($params{page}, $params{pages});
@@ -53,14 +62,23 @@ sub preprocess (@) { #{{{
 
 	my @data=eval qq{IkiWiki::Plugin::postsparkline::formula::$formula(\\\%params, \@list)};
 	if ($@) {
-		return "[[postsparkline error $@]]";
+		error $@;
+	}
+
+	if (! @data) {
+		# generate an empty graph
+		push @data, 0 foreach 1..($params{max} / 2);
 	}
+
+	my $color=exists $params{color} ? "($params{color})" : "";
+
 	delete $params{pages};
 	delete $params{formula};
 	delete $params{ftime};
+	delete $params{color};
 	return IkiWiki::Plugin::sparkline::preprocess(%params, 
-		map { $_ => "" } reverse @data);
-} # }}}
+		map { $_.$color => "" } reverse @data);
+}
 
 sub perfoo ($@) {
 	my $sub=shift;