X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=clearadm%2Fplotfs.cgi;h=e02bd10530617624bc5712eb20642974e82b0a08;hb=7ddf095f187ca60d9a70fb83b2bc3c2b6d91f088;hp=2556a34fd9c759588e29bf0b29bef19dfc7787a5;hpb=020a4a5ea2be725b155cae3a2cadc9aba3911b9b;p=clearscm.git

diff --git a/clearadm/plotfs.cgi b/clearadm/plotfs.cgi
index 2556a34..e02bd10 100755
--- a/clearadm/plotfs.cgi
+++ b/clearadm/plotfs.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 
 =pod
 
@@ -61,6 +61,7 @@ use strict;
 use warnings;
 
 use FindBin;
+use Convert::Base64;
 
 use lib "$FindBin::Bin/lib", "$FindBin::Bin/../lib";
 
@@ -68,7 +69,7 @@ use Clearadm;
 use ClearadmWeb;
 use Display;
 
-use CGI qw (:standard :cgi-lib);
+use CGI qw(:standard :cgi-lib);
 use GD::Graph::area;
 
 my %opts = Vars;
@@ -87,15 +88,9 @@ if ($opts{tiny}) {
   $opts{scaling} = 'Day';
 } # if
 
-sub labelY ($) {
-  my ($value) = @_;
-
-  return $opts{tiny} ? '' : $value;  
-} # labelY
-
 my $clearadm = Clearadm->new;
 
-my $graph = GD::Graph::area->new ($opts{width}, $opts{height});
+my $graph = GD::Graph::area->new($opts{width}, $opts{height});
 
 graphError "System is required"
   unless $opts{system};
@@ -106,7 +101,7 @@ graphError "Filesystem is required"
 graphError "Points not numeric (points: $opts{points})"
   if $opts{points} and $opts{points} !~ /^\d+$/;
   
-my @fs = $clearadm->GetFS (
+my @fs = $clearadm->GetFS(
   $opts{system},
   $opts{filesystem},
   $opts{start},
@@ -122,7 +117,7 @@ my (@x, @y);
 
 my $i = 0;
 
-foreach (@fs) {
+for (@fs) {
   $i++;
   my %fs = %{$_};
   
@@ -132,8 +127,10 @@ foreach (@fs) {
     push @x, $fs{timestamp};
   } # if
 
-  push @y, sprintf ('%.2f', $fs{used} / (1024 * 1024));    
-}
+  push @y, $opts{meg} ? $fs{used} / (1024 * 1024) :
+                        $fs{used} / (1024 * 1024 * 12024);
+} # for
+
 my @data = ([@x], [@y]);
 
 my $x_label_skip = @x > 1000 ? 200
@@ -143,17 +140,19 @@ my $x_label_skip = @x > 1000 ? 200
                  : 0;
                  
 my $x_label = $opts{tiny} ? '' : 'Filesystem Usage';
-my $y_label = $opts{tiny} ? '' : 'Used (Meg)';
+my $y_label = $opts{tiny} ? '' : 
+              $opts{msg}  ? 'Used (Meg)' : 'Used (Gig)';
 my $title   = $opts{tiny} ? '' : "Filesystem usage for "
                                . "$opts{system}:$opts{filesystem}";
+my $labelY  = $opts{tiny} ? '' : '%.2f';
 
-$graph->set (
+$graph->set(
   x_label           =>$x_label,
   x_labels_vertical => 1,
   x_label_skip      => $x_label_skip,
   x_label_position  => .5,
   y_label           => $y_label,
-  y_number_format   => &labelY,
+  y_number_format   => $labelY,
   title             => $title,
   dclrs             => [$opts{color}],
   bgclr             => 'white',
@@ -168,8 +167,12 @@ $graph->set (
 my $image = $graph->plot(\@data)
   or croak $graph->error;
 
-print "Content-type: image/png\n\n";
-print $image->png;
+unless ($opts{generate}) {
+  print "Content-type: image/png\n\n";
+  print $image->png;
+} else {
+  print encode_base64 $image->png;
+} # unless
 
 =pod
 
@@ -206,9 +209,9 @@ L<GD::Graph::area|GD::Graph::area>
 =begin html
 
 <blockquote>
-<a href="http://clearscm.com/php/cvs_man.php?file=clearadm/lib/Clearadm.pm">Clearadm</a><br>
-<a href="http://clearscm.com/php/cvs_man.php?file=clearadm/lib/ClearadmWeb.pm">ClearadmWeb</a><br>
-<a href="http://clearscm.com/php/cvs_man.php?file=lib/Display.pm">Display</a><br>
+<a href="http://clearscm.com/php/scm_man.php?file=clearadm/lib/Clearadm.pm">Clearadm</a><br>
+<a href="http://clearscm.com/php/scm_man.php?file=clearadm/lib/ClearadmWeb.pm">ClearadmWeb</a><br>
+<a href="http://clearscm.com/php/scm_man.php?file=lib/Display.pm">Display</a><br>
 </blockquote>
 
 =end html