From d14c1e8e9b0957f533ef8308fe34055e7141176a Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 12 Apr 2011 20:50:11 +0000
Subject: [PATCH] add new database table for cef_switching and change php.
 notice this has no 'discovery' module. why do we need to 'discover' when we
 walk tables? eh? eh? :)

git-svn-id: http://www.observium.org/svn/observer/trunk@2062 61d68cd4-352d-0410-923a-c4978735b2b8
---
 database-update.sql                | 1 +
 includes/polling/cisco-cef.inc.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/database-update.sql b/database-update.sql
index b7cb840c6..1eaf736dd 100644
--- a/database-update.sql
+++ b/database-update.sql
@@ -32,3 +32,4 @@ CREATE TABLE IF NOT EXISTS `vminfo` (`id` int(11) NOT NULL AUTO_INCREMENT, `devi
 ALTER TABLE `ports` MODIFY  `port_descr_type` VARCHAR(255);
 RENAME TABLE  `vmware_vminfo` TO  `vminfo` ;
 ALTER TABLE `vminfo` ADD `vm_type` VARCHAR(16) NOT NULL DEFAULT 'vmware' AFTER `device_id`;
+CREATE TABLE IF NOT EXISTS `cef_switching` (  `device_id` int(11) NOT NULL,  `entPhysicalIndex` int(11) NOT NULL,  `afi` varchar(4) COLLATE utf8_unicode_ci NOT NULL,  `cef_index` int(11) NOT NULL,  `cef_path` varchar(16) COLLATE utf8_unicode_ci NOT NULL,  `drop` int(11) NOT NULL,  `punt` int(11) NOT NULL,  `punt2host` int(11) NOT NULL,  `drop_prev` int(11) NOT NULL,  `punt_prev` int(11) NOT NULL,  `punt2host_prev` int(11) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/includes/polling/cisco-cef.inc.php b/includes/polling/cisco-cef.inc.php
index 824c6445d..077c4eb59 100755
--- a/includes/polling/cisco-cef.inc.php
+++ b/includes/polling/cisco-cef.inc.php
@@ -31,10 +31,10 @@ if (is_array($cefs))
         echo(" | |-".$path.": ".$path_name['cefSwitchingPath']);
 
 
-        if(mysql_result(mysql_query("SELECT COUNT(*) FROM `cef` WHERE `device_id` = '".$device['device_id']."' AND `entPhysicalIndex` = '".$entity."' 
+        if(mysql_result(mysql_query("SELECT COUNT(*) FROM `cef_switching` WHERE `device_id` = '".$device['device_id']."' AND `entPhysicalIndex` = '".$entity."' 
                                      AND `afi` = '".$afi."' AND `cef_index` = '".$path."'"),0) != "1")
         {
-	  $sql = "INSERT INTO `cef` (`device_id`, `entPhysicalIndex`, `afi`, `cef_index`, `cef_path`) 
+	  $sql = "INSERT INTO `cef_switching` (`device_id`, `entPhysicalIndex`, `afi`, `cef_index`, `cef_path`) 
                   VALUES ('".$device['device_id']."', '".$entity."', '".$afi."', '".$path."', '".$path_name['cefSwitchingPath']."')";
 	  mysql_query($sql);
           echo("+");