Update

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

diff --git a/gui/bacula-web/README b/gui/bacula-web/README
index 091abbdbb18536a8f1ae5b076965c2b9c5c5fccf..dfd6bccce22bd4ac7057a650c0bbdd4c783722ae 100644 (file)
--- 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 8465a018e8d754008f22f9a0246d294ba8b21514..1f0cc9fa25d113ebcd5aa1e7f11a3521088b02b9 100644 (file)
--- 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)"]));