- added images for oracle & some oracle fixes (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@3600 97f52cf1-0a1b-0410-bd0e-c28be96e8082

3 files changed, 72 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5418bd43..a0e958f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Changes for 1.3.1:
 
+ - added images for oracle(Eugene)
  - added images for sqlite3(Eugene)
 
 Changes for 1.3.1:
diff --git a/create/data/images_oracle.sql b/create/data/images_oracle.sql
new file mode 100644
index 00000000..f68df3e1
--- /dev/null
+++ b/create/data/images_oracle.sql
@@ -0,0 +1,69 @@
+-- 
+-- Zabbix
+-- Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+--
+
+--
+-- Dumping data for table images
+--
+
+CREATE OR REPLACE DIRECTORY image_dir AS '/home/zabbix/zabbix/create/data/images'
+/
+
+CREATE OR REPLACE PROCEDURE LOAD_IMAGE (IMG_ID IN NUMBER, IMG_TYPE IN NUMBER, IMG_NAME IN VARCHAR2, FILE_NAME IN VARCHAR2) 
+IS 
+	TEMP_BLOB BLOB := EMPTY_BLOB(); 
+	BFILE_LOC BFILE; 
+BEGIN 
+	DBMS_LOB.CREATETEMPORARY(TEMP_BLOB,TRUE,DBMS_LOB.SESSION); 
+	BFILE_LOC := BFILENAME('IMAGE_DIR', FILE_NAME); 
+	DBMS_LOB.FILEOPEN(BFILE_LOC);
+	DBMS_LOB.LOADFROMFILE(TEMP_BLOB, BFILE_LOC, DBMS_LOB.GETLENGTH(BFILE_LOC)); 
+	DBMS_LOB.FILECLOSE(BFILE_LOC);
+	INSERT INTO IMAGES VALUES (IMG_ID, IMG_TYPE, IMG_NAME, TEMP_BLOB); 
+	COMMIT; 
+END LOAD_IMAGE;
+/
+
+BEGIN
+	LOAD_IMAGE(1,1,'Hub'			,'Hub.png');
+	LOAD_IMAGE(2,1,'Hub (small)'		,'Hub_small.png');
+	LOAD_IMAGE(3,1,'Network'		,'Network.png');
+	LOAD_IMAGE(4,1,'Network (small)'	,'Network_small.png');
+	LOAD_IMAGE(5,1,'Notebook'		,'Notebook.png');
+	LOAD_IMAGE(6,1,'Notebook (small)'	,'Notebook_small.png');
+	LOAD_IMAGE(7,1,'Phone'			,'Phone.png');
+	LOAD_IMAGE(8,1,'Phone (small)'		,'Phone_small.png');
+	LOAD_IMAGE(9,1,'Printer'		,'Printer.png');
+	LOAD_IMAGE(10,1,'Printer (small)'	,'Printer_small.png');
+	LOAD_IMAGE(11,1,'Router'		,'Router.png');
+	LOAD_IMAGE(12,1,'Router (small)'	,'Router_small.png');
+	LOAD_IMAGE(13,1,'Satellite'		,'Satellite.png');
+	LOAD_IMAGE(14,1,'Satellite (small)'	,'Satellite_small.png');
+	LOAD_IMAGE(15,1,'Server'		,'Server.png');
+	LOAD_IMAGE(16,1,'Server (small)'	,'Server_small.png');
+	LOAD_IMAGE(17,1,'UPS'			,'UPS.png');
+	LOAD_IMAGE(18,1,'UPS (small)'		,'UPS_small.png');
+	LOAD_IMAGE(19,1,'Workstation'		,'Workstation.png');
+	LOAD_IMAGE(20,1,'Workstation (small)'	,'Workstation_small.png');
+END;
+/
+
+DROP PROCEDURE LOAD_IMAGE;
+
+DROP DIRECTORY image_dir;
+
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index f4433f91..5ff02cf5 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -60,7 +60,7 @@
 					break;
 				case "ORACLE":
 					$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)))");
+					//$DB = ocilogon($DB_USER, $DB_PASSWORD, "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$DB_SERVER)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=$DB_DATABASE)))");
 					if(!$DB)
 					{
 						$error = "Error connecting to database";
@@ -142,7 +142,7 @@
 			{
 				case "MYSQL":		$result = mysql_close($DB);	break;
 				case "POSTGRESQL":	$result = pg_close($DB);	break;
-				case "ORACLE":		$result = ociclose($DB);	break;
+				case "ORACLE":		$result = ocilogoff($DB);	break;
 				case "SQLITE3":		
 					$result = true; 
 					sqlite3_close($DB);