--- trunk/lib/Frey/jQuery/flot.pm 2008/12/17 17:59:59 871
+++ trunk/lib/Frey/jQuery/flot.pm 2008/12/17 18:15:17 873
@@ -58,7 +58,12 @@
$dataset->{ $name }->{data} = $by_col->{$nr};
}
- my $data_js = 'var datasets = ' . to_json( $dataset ) . ";\n";
+ my $placeholder = qq|
no data found
|;
+ my $data_js = '';
+ if ( $dataset ) {
+ $data_js = 'var datasets = ' . to_json( $dataset ) . ";\n";
+ $placeholder = qq||;
+ }
warn "# $data_js" if $self->debug;
@@ -73,6 +78,8 @@
my $flags = `atsar help 2>&1`;
$flags =~ s{^.+flags:\s+}{}s;
+ $flags =~ s{^\s*-[AS].+$}{}gm; # remove -A and -S flags which doesn't make sense
+ $flags =~ s{^\s+}{}s;
foreach my $line ( split(/\s*\n\s*/, $flags ) ) {
my ( $flag, $desc ) = split(/\s+/, $line, 2 );
@@ -91,12 +98,15 @@
#choices, form { float: left; }
|);
+ return
qq|
-
+
+ $placeholder
$sar
$form
+
Show
| . q|