[Bacula-commits] gui/bweb/lib Bweb.pm,1.32,1.33

[Eric B. <ri...@us...>]

Update of /cvsroot/bacula/gui/bweb/lib
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24846/lib

Modified Files:
	Bweb.pm 
Log Message:
ebl  fix remove Purged and Recycle volume size from total pool size

Index: Bweb.pm
===================================================================
RCS file: /cvsroot/bacula/gui/bweb/lib/Bweb.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Bweb.pm	25 Oct 2006 12:59:47 -0000	1.32
+++ Bweb.pm	31 Oct 2006 21:19:16 -0000	1.33
@@ -2459,8 +2459,21 @@
 
     my $all = $self->dbh_selectall_hashref($query, 'name') ;
 
+    $query = "
+SELECT Pool.Name AS name,
+       sum(VolBytes) AS size
+FROM   Media JOIN Pool ON (Media.PoolId = Pool.PoolId)
+WHERE  Media.VolStatus IN ('Recycled', 'Purged')
+GROUP BY Pool.Name;
+";
+    my $empty = $self->dbh_selectall_hashref($query, 'name');
+
     foreach my $p (values %$all) {
 	if ($p->{volmax} > 0) { # mysql returns 0.0000
+	    # we remove Recycled/Purged media from pool usage
+	    if (defined $empty->{$p->{name}}) {
+		$p->{voltotal} -= $empty->{$p->{name}}->{size};
+	    }
 	    $p->{poolusage} = sprintf('%.2f', $p->{voltotal} * 100/ $p->{volmax}) ;
 	} else {
 	    $p->{poolusage} = 0;