From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 20 Sep 2006 16:53:31 +0000 (+0000)
Subject: ebl  fix postgresql query
X-Git-Tag: Release-2.0.0~427
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f2ba9d5adc9337d9b7461f867087978b4e0b987f;p=bacula%2Fbacula

ebl  fix postgresql query


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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index d5a2af7fe8..e12c165b71 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -2480,9 +2480,9 @@ sub display_pool
 # TODO : afficher les tailles et les dates
 
     my $query = "
-SELECT sum(subq.volmax)   AS volmax,
-       sum(subq.volnum)   AS volnum,
-       sum(subq.voltotal) AS voltotal,
+SELECT subq.volmax        AS volmax,
+       subq.volnum        AS volnum,
+       subq.voltotal      AS voltotal,
        Pool.Name          AS name,
        Pool.Recycle       AS recycle,
        Pool.VolRetention  AS volretention,
@@ -2505,10 +2505,9 @@ FROM
               WHERE Media.VolStatus = 'Full' 
               GROUP BY Media.MediaType
                ) AS media_avg_size ON (Media.MediaType = media_avg_size.MediaType)
-    GROUP BY Media.MediaType, Media.PoolId
-  ) AS subq 
-LEFT JOIN Pool ON (Pool.PoolId = subq.PoolId) 
-GROUP BY subq.PoolId
+    GROUP BY Media.MediaType, Media.PoolId, media_avg_size.volavg
+  ) AS subq
+LEFT JOIN Pool ON (Pool.PoolId = subq.PoolId)
 ";
 
     my $all = $self->dbh_selectall_hashref($query, 'name') ;