diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-22 12:24:14 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-22 12:24:14 +0000 |
| commit | dc973146155891aee48aa92e94033413eba3d1b9 (patch) | |
| tree | 679fe8ae92fc29f79c73752f22f803d5e8c57cf0 /frontends/php/include/classes/chart.inc.php | |
| parent | ea3bf2726f4600d556df46bdc78945a002cc4c01 (diff) | |
| download | zabbix-dc973146155891aee48aa92e94033413eba3d1b9.tar.gz zabbix-dc973146155891aee48aa92e94033413eba3d1b9.tar.xz zabbix-dc973146155891aee48aa92e94033413eba3d1b9.zip | |
- [ZBX-283] fixes in SQL statement (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5270 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/classes/chart.inc.php')
| -rw-r--r-- | frontends/php/include/classes/chart.inc.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/frontends/php/include/classes/chart.inc.php b/frontends/php/include/classes/chart.inc.php index d48d7a46..8fb74055 100644 --- a/frontends/php/include/classes/chart.inc.php +++ b/frontends/php/include/classes/chart.inc.php @@ -651,7 +651,6 @@ class Chart extends Graph{ } function selectData(){ - global $DB_TYPE; $this->data = array(); @@ -683,7 +682,7 @@ class Chart extends Graph{ $to_time = $this->to_time; } - $calc_field = 'round('.$x.'*(mod(clock+'.$z.','.$p.'))/('.$p.'),0)'; /* required for 'group by' support of Oracle */ + $calc_field = 'round('.$x.'*(mod('.zbx_dbcast_2bigint('clock').'+'.$z.','.$p.'))/('.$p.'),0)'; /* required for 'group by' support of Oracle */ $sql_arr = array(); if(($this->period / $this->sizeX) <= (ZBX_MAX_TREND_DIFF / ZBX_GRAPH_MAX_SKIP_CELL)){ @@ -713,7 +712,7 @@ class Chart extends Graph{ $this->items[$i]['delay'] = max(($this->items[$i]['delay']*ZBX_GRAPH_MAX_DELAY),ZBX_MAX_TREND_DIFF)/ZBX_GRAPH_MAX_DELAY + 1; } - +//SDI($sql_arr); $curr_data = &$this->data[$this->items[$i]["itemid"]][$type]; $curr_data->count = NULL; $curr_data->min = NULL; |