ebl Can use nb files instead of file size

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6106 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/bweb/cgi/bgraph.pl b/gui/bweb/cgi/bgraph.pl
index bbf61e33fc39b3c1d22babe9f67f99a6759c97fe..535d92733b0074c5c2e7f6c9bc79337080fa2fab 100755 (executable)
--- a/gui/bweb/cgi/bgraph.pl
+++ b/gui/bweb/cgi/bgraph.pl
@@ -121,10 +121,37 @@ if ($gtype eq 'balloon') {
     use Digest::MD5 qw(md5_hex);
     use GBalloon;
 
+    my $b = new GBalloon(width=>$arg->{width}, 
+                        height =>$arg->{height});
+
+    my $order;
+    my %legend = (x_title => 'Time', 
+                 x_func => sub { 
+                     POSIX::strftime('%H:%M', gmtime($_[0])) 
+                     }
+                 ) ;
+    if ($graph eq 'job_time_size') {
+       $order = 'JobFiles,JobBytes';
+
+       $legend{y_title} = 'Nb files';
+       $legend{y_func} = sub { int(shift)};
+       $legend{z_title} = 'Size';
+       $legend{z_func} = \&Bweb::human_size;
+    } else {
+       $order = 'JobBytes,JobFiles';
+
+       $legend{y_title} = 'Size';
+       $legend{y_func} = \&Bweb::human_size;
+       $legend{z_title} = 'Nb files';
+       $legend{z_func} = sub { int(shift)};
+    }
+
+    $b->set_legend_axis(%legend);
+
     my $all = $dbh->selectall_arrayref("
 SELECT $bweb->{sql}->{SEC_TO_INT}(  $bweb->{sql}->{UNIX_TIMESTAMP}(EndTime)
                                   - $bweb->{sql}->{UNIX_TIMESTAMP}(StartTime))
-         AS duration, JobBytes, JobFiles, JobId, $jobt.Name
+         AS duration, $order, JobId, $jobt.Name
        
  FROM $jobt, Client $filter $groupf
 WHERE $jobt.ClientId = Client.ClientId
@@ -137,19 +164,10 @@ WHERE $jobt.ClientId = Client.ClientId
 $limitq
 ");
 
-    my $b = new GBalloon(width=>$arg->{width}, 
-                        height =>$arg->{height});
-    $b->set_legend_axis(x_title => 'Time', 
-                       x_func => sub { 
-                           POSIX::strftime('%H:%M', gmtime($_[0])) 
-                           },
-                       y_title => 'Size', y_func => \&Bweb::human_size,
-                       z_title => 'Nb files');
-
     foreach my $a (@$all) {
        $b->add_point($a->[0], $a->[1], $a->[2], 
                      "?action=job_zoom;jobid=$a->[3]",
-                     "$a->[4] $a->[2] files");
+                     "$a->[4] $legend{z_title} " . $legend{z_func}($a->[2]));
     }
     
     $b->init_gd();

diff --git a/gui/bweb/lib/GBalloon.pm b/gui/bweb/lib/GBalloon.pm
index cf6a4a0208a5c3a6fcf8d4694259280d970a959f..4ff45f2b1bde30b77c39e5b9c3a47aae3fdfa366 100644 (file)
--- a/gui/bweb/lib/GBalloon.pm
+++ b/gui/bweb/lib/GBalloon.pm
@@ -179,6 +179,15 @@ sub finalize
 sub set_legend_axis
 {
     my ($self, %arg) = @_;
+
+    unless ($arg{x_func}) {
+       $arg{x_func} = sub { join(" ", @_) }
+    }
+
+    unless ($arg{y_func}) {
+       $arg{y_func} = sub { join(" ", @_) }
+    }
+
     $self->{axis} = \%arg;
 }