From 1f73ca36c21dbaf9c71b2fa8510f0301140e2b3e Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 5 Nov 2005 22:11:40 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2549 91ce42f0-d328-0410-95d8-f526ca767f89 --- gui/bacula-web/README | 4 +++- gui/bacula-web/classes.inc | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gui/bacula-web/README b/gui/bacula-web/README index 091abbdbb1..dfd6bccce2 100644 --- a/gui/bacula-web/README +++ b/gui/bacula-web/README @@ -15,7 +15,9 @@ REQUIREMENTS: - TrueType (optional) - Pear DB (http://pear.php.net/package/DB) - MySQL or PostgreSQL - - Sessions + - Sessions + - If you use PostgreSQL + - dbsize contrib package - Bacula (Oh!, yes, you need this ;-) ) http://www.bacula.org diff --git a/gui/bacula-web/classes.inc b/gui/bacula-web/classes.inc index 8465a018e8..1f0cc9fa25 100644 --- a/gui/bacula-web/classes.inc +++ b/gui/bacula-web/classes.inc @@ -383,9 +383,9 @@ class BCreateGraph extends BGraph { or die ("classes.inc: Error at query: 8"); } else if ($DB_bacula->driver == "pgsql") { - $res = $DB_bacula->link->query("select Name from Job where EndTime > now()) - $this->elapsed group by Name order by Name desc") + $res = $DB_bacula->link->query("select Name from Job where EndTime > now() - interval '$this->elapsed seconds' group by Name order by Name desc") or die ("classes.inc: Error at query: 8"); - $resdata = $DB_bacula->link->query("select date_format(EndTime,\"%Y-%m-%d\") from Job where EndTime > NOW() - $this->elapsed group by date_format(EndTime,\"%Y-%m-%d\") order by EndTime") + $resdata = $DB_bacula->link->query("select date(EndTime) from Job where EndTime > NOW() - interval '$this->elapsed seconds' group by EndTime order by EndTime") or die ("classes.inc: Error at query: 9"); } @@ -408,7 +408,7 @@ class BCreateGraph extends BGraph { $result = $DB_bacula->link->query("select date_format(EndTime,\"%Y-%m-%d\"),SUM(JobBytes),Name,count(Name) as Nname from Job WHERE EndTime like '$tmpdata[0]%' group by Name order by Name desc") or die ("classes.inc: Error at query: 10"); else if ($DB_bacula->driver == "pgsql") - $result = $DB_bacula->link->query("select date_format(EndTime,'%Y-%m-%d'),SUM(JobBytes),Name,count(Name) as Nname from Job WHERE EndTime like '$tmpdata[0]%' group by EndTime,Name order by Name desc") + $result = $DB_bacula->link->query("select date(EndTime),SUM(JobBytes),Name,count(Name) as Nname from Job WHERE EndTime like '$tmpdata[0]%' group by EndTime,Name order by Name desc") or die ("classes.inc: Error at query: 11"); while ( $row = $result->fetchRow(DB_FETCHMODE_ASSOC) ) { $spr2 = array_merge($spr2,array($row["Name"]=>$row["SUM(JobBytes)"])); -- 2.39.5