diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-06-21 19:21:27 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-06-21 19:21:27 +0000 |
| commit | 67006e3becb64e74e1ea027e7ba5dd6f7dbcc90d (patch) | |
| tree | e8f2be055bf7873bec90e7692b942679db611df6 /frontends/php/include/db.inc.php | |
| parent | d870b9916b73f2fa2c485e4f202d974cca6d2c19 (diff) | |
| download | zabbix-67006e3becb64e74e1ea027e7ba5dd6f7dbcc90d.tar.gz zabbix-67006e3becb64e74e1ea027e7ba5dd6f7dbcc90d.tar.xz zabbix-67006e3becb64e74e1ea027e7ba5dd6f7dbcc90d.zip | |
- minor Oracle related fixes for frontend (Alexe0
git-svn-id: svn://svn.zabbix.com/trunk@4330 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/db.inc.php')
| -rw-r--r-- | frontends/php/include/db.inc.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php index 8fb45872..4cfbef5e 100644 --- a/frontends/php/include/db.inc.php +++ b/frontends/php/include/db.inc.php @@ -59,7 +59,8 @@ } break; case "ORACLE": - $DB = ocilogon($DB_USER, $DB_PASSWORD, ""); + $DB = ocilogon($DB_USER, $DB_PASSWORD, $DB_DATABASE); +// $DB = ocilogon($DB_USER, $DB_PASSWORD, ""); //$DB = ocilogon($DB_USER, $DB_PASSWORD, "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$DB_SERVER)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=$DB_DATABASE)))"); if(!$DB) { @@ -447,13 +448,15 @@ if(isset($DB_TYPE) && $DB_TYPE == "ORACLE") { switch($DB_TYPE) { case "MYSQL": - $odiv = 'div'; + $result = '('.$id_name.' div 100000000000000)'; + break; + case "ORACLE": + $result = 'round('.$id_name.'/100000000000000)'; break; default: - $odiv = '/'; + $result = '('.$id_name.'/100000000000000)'; } - - return '('.$id_name.' '.$odiv.' 100000000000000)'; + return $result; } function id2nodeid($id_var) |