From 90dfbfa14134274e1c49df7f97bab690d2e072c9 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 20 May 2011 14:27:53 +0000
Subject: [PATCH] fix some things

git-svn-id: http://www.observium.org/svn/observer/trunk@2351 61d68cd4-352d-0410-923a-c4978735b2b8
---
 discovery.php                    | 11 +++++++++++
 html/pages/ports/default.inc.php |  2 +-
 includes/dbFacile.php            | 24 ++++++++++++++++++++----
 includes/polling/ospf.inc.php    |  7 ++++++-
 poller.php                       | 11 +++++++++++
 5 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/discovery.php b/discovery.php
index 1f3135065..fb12d54c2 100755
--- a/discovery.php
+++ b/discovery.php
@@ -234,6 +234,17 @@ if ($debug) echo("$string\n");
 
 if($config['version_check'] && !isset($options['q'])) {
   include("includes/versioncheck.inc.php");
+
+  echo('MySQL: Cell['.($db_stats['fetchcell']+0).'/'.round($db_stats['fetchcell_sec']+0,2).'s]'.
+              ' Row['   .($db_stats['fetchrow']+0). '/'.round($db_stats['fetchrow_sec']+0,2).'s]'.
+             ' Rows['   .($db_stats['fetchrows']+0).'/'.round($db_stats['fetchrows_sec']+0,2).'s]'.
+           ' Column['.($db_stats['fetchcol']+0). '/'.round($db_stats['fetchcol_sec']+0,2).'s]'.
+           ' Update['   .($db_stats['update']+0).'/'.round($db_stats['update_sec']+0,2).'s]'.
+           ' Insert['.($db_stats['insert']+0). '/'.round($db_stats['insert_sec']+0,2).'s]'.
+           ' Delete['.($db_stats['delete']+0). '/'.round($db_stats['delete_sec']+0,2).'s]');
+
+  echo("\n");
+
 }
 
 logfile($string);
diff --git a/html/pages/ports/default.inc.php b/html/pages/ports/default.inc.php
index 79dbe10d1..562e44ac3 100644
--- a/html/pages/ports/default.inc.php
+++ b/html/pages/ports/default.inc.php
@@ -6,7 +6,7 @@
       <select name='device_id' id='device_id'>
       <option value=''>All Devices</option>
 <?php
-foreach (dbFetchRows("SELECT `device_id`,`hostname` FROM `devices` GROUP BY `hostname` ORDER BY `hostname`") as $dat)
+foreach (dbFetchRows("SELECT `device_id`,`hostname` FROM `devices` GROUP BY `hostname` ORDER BY `hostname`") as $data)
 {
   echo("<option value='".$data['device_id']."'");
   if ($data['device_id'] == $_POST['device_id']) { echo("selected"); }
diff --git a/includes/dbFacile.php b/includes/dbFacile.php
index 8a5a869e7..374c7e0cb 100644
--- a/includes/dbFacile.php
+++ b/includes/dbFacile.php
@@ -51,6 +51,7 @@ function dbQuery($sql, $parameters = array()) {
  * */
 function dbInsert($data, $table) {
 	global $fullSql;
+        global $db_stats;
 	// the following block swaps the parameters if they were given in the wrong order.
 	// it allows the method to work for those that would rather it (or expect it to)
 	// follow closer with SQL convention:
@@ -64,19 +65,26 @@ function dbInsert($data, $table) {
 
 	$sql = 'INSERT INTO `' . $table . '` (`' . implode('`,`', array_keys($data)) . '`)  VALUES (' . implode(',', dbPlaceHolders($data)) . ')';
 
+        $time_start = microtime(true);
 	dbBeginTransaction();
 	$result = dbQuery($sql, $data);
 	if($result) {
 		$id = mysql_insert_id();
 		dbCommitTransaction();
-		return $id;
+		#return $id;
 	} else {
 		if($table != 'Contact') {
 			trigger_error('QDB - Insert failed.', E_USER_WARNING);
 		}
 		dbRollbackTransaction();
-		return false;
+		#$id = false;
 	}
+        $time_end = microtime(true);
+        $db_stats['insert_sec'] += number_format($time_end - $time_start, 8);
+        $db_stats['insert']++;
+
+        return $id;
+
 }
 
 /*
@@ -85,6 +93,7 @@ function dbInsert($data, $table) {
  * */
 function dbUpdate($data, $table, $where = null, $parameters = array()) {
 	global $fullSql;
+        global $db_stats;
 	// the following block swaps the parameters if they were given in the wrong order.
 	// it allows the method to work for those that would rather it (or expect it to)
 	// follow closer with SQL convention:
@@ -109,13 +118,20 @@ function dbUpdate($data, $table, $where = null, $parameters = array()) {
 		$data = array_merge($data, $parameters);
 	}
 
+        $time_start = microtime(true);
 	if(dbQuery($sql, $data)) {
-		return mysql_affected_rows();
+		$return = mysql_affected_rows();
 	} else {
                 #echo("$fullSql");
 		trigger_error('QDB - Update failed.', E_USER_WARNING);
-		return false;
+		$return = false;
 	}
+        $time_end = microtime(true);
+        $db_stats['update_sec'] += number_format($time_end - $time_start, 8);
+        $db_stats['update']++;
+
+        return $return;
+
 }
 
 function dbDelete($table, $where = null, $parameters = array()) {
diff --git a/includes/polling/ospf.inc.php b/includes/polling/ospf.inc.php
index 17f2161f3..d62403cf4 100644
--- a/includes/polling/ospf.inc.php
+++ b/includes/polling/ospf.inc.php
@@ -285,9 +285,14 @@ if (is_array($ospf_nbrs_db))
 
       if ($ospf_nbr_db['interface_id'] != $ospf_nbr_poll['interface_id'])
       {
-        $ospf_nbr_update = " ";
+        if($ospf_nbr_poll['interface_id']) {
+          $ospf_nbr_update = array('interface_id' => $ospf_nbr_poll['interface_id']);
+        } else {
+          $ospf_nbr_update = array('interface_id' => array('NULL'));
+        }
       }
 
+
       foreach ($ospf_nbr_oids as $oid)
       { // Loop the OIDs
         if ($debug) { echo($ospf_nbr_db[$oid]."|".$ospf_nbr_poll[$oid]."\n"); }
diff --git a/poller.php b/poller.php
index fb4cf56a0..8c51f4825 100755
--- a/poller.php
+++ b/poller.php
@@ -106,6 +106,7 @@ function poll_device($device, $options) {
   global $config;
   global $device;
   global $polled_devices;
+  global $db_stats;
 
   $attribs = get_dev_attribs($device['device_id']);
 
@@ -239,6 +240,16 @@ if (!$options['m'])
   $string = $argv[0] . " $doing " .  date("F j, Y, G:i") . " - $polled_devices devices polled in $poller_time secs";
   if ($debug) echo("$string\n");
 
+  echo('MySQL: Cell['.($db_stats['fetchcell']+0).'/'.round($db_stats['fetchcell_sec']+0,2).'s]'.
+              ' Row['   .($db_stats['fetchrow']+0). '/'.round($db_stats['fetchrow_sec']+0,2).'s]'.
+             ' Rows['   .($db_stats['fetchrows']+0).'/'.round($db_stats['fetchrows_sec']+0,2).'s]'.
+           ' Column['.($db_stats['fetchcol']+0). '/'.round($db_stats['fetchcol_sec']+0,2).'s]'.
+           ' Update['   .($db_stats['update']+0).'/'.round($db_stats['update_sec']+0,2).'s]'.
+           ' Insert['.($db_stats['insert']+0). '/'.round($db_stats['insert_sec']+0,2).'s]'.
+           ' Delete['.($db_stats['delete']+0). '/'.round($db_stats['delete_sec']+0,2).'s]');
+
+  echo("\n");
+
   logfile($string);
 
   unset($config); ### Remove this for testing