From b89fe125038cbe006edf2eb8faf10aadee518086 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sun, 15 Apr 2007 15:16:11 +0000
Subject: [PATCH] Fixing some tiny things.

git-svn-id: http://www.observium.org/svn/observer/trunk@96 61d68cd4-352d-0410-923a-c4978735b2b8
---
 cron-hourly.sh   | 13 +++++++------
 discover-cdp.php |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cron-hourly.sh b/cron-hourly.sh
index c61aa450f..f456156a8 100755
--- a/cron-hourly.sh
+++ b/cron-hourly.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
-./cdp.php
+./discover-cdp.php
 ./discover-ifs.php
 ./discover-nets.php
 ./ips.php
-./discover-storage.php
+./discover-storage.php &
 ./cleanup.php
-./discover-temperatures.php
-./generate-map.sh
-./discover-cisco-temp.php
-./update-interface.php
+./discover-temperatures.php &
+./generate-map.sh &
+./discover-cisco-temp.php &
+./discover-vlans.php &
+./update-interface.php &
diff --git a/discover-cdp.php b/discover-cdp.php
index 675b38f63..eecfe1917 100755
--- a/discover-cdp.php
+++ b/discover-cdp.php
@@ -49,11 +49,11 @@ while ($device = mysql_fetch_array($device_query)) {
     } else { echo("Bad DNS for $dst_host\n"); }
     if ( mysql_result(mysql_query("SELECT COUNT(*) FROM `devices` WHERE `hostname` = '$dst_host'"), 0) == '1' && 
       mysql_result(mysql_query("SELECT COUNT(*) FROM `devices` WHERE `hostname` = '$src_host'"), 0) == '1' &&
-      mysql_result(mysql_query("SELECT COUNT(*) FROM `interfaces` AS I, `devices` AS D WHERE `if` = '$dst_if' AND hostname = '$dst_host' AND D.id = I.host"), 0) == '1' && 
-      mysql_result(mysql_query("SELECT COUNT(*) FROM `interfaces` AS I, `devices` AS D WHERE `if` = '$src_if' AND hostname = '$src_host' AND D.id = I.host"), 0) == '1')
+      mysql_result(mysql_query("SELECT COUNT(*) FROM `interfaces` AS I, `devices` AS D WHERE `ifDescr` = '$dst_if' AND hostname = '$dst_host' AND D.device_id = I.device_id"), 0) == '1' && 
+      mysql_result(mysql_query("SELECT COUNT(*) FROM `interfaces` AS I, `devices` AS D WHERE `ifDescr` = '$src_if' AND hostname = '$src_host' AND D.device_id = I.device_id"), 0) == '1')
    {
-      $dst_if_id   = mysql_result(mysql_query("SELECT I.id FROM `interfaces` AS I, `devices` AS D WHERE `if` = '$dst_if' AND hostname = '$dst_host' AND D.id = I.host"), 0);
-      $src_if_id   = mysql_result(mysql_query("SELECT I.id FROM `interfaces` AS I, `devices` AS D WHERE `if` = '$src_if' AND hostname = '$src_host' AND D.id = I.host"), 0);
+      $dst_if_id   = mysql_result(mysql_query("SELECT I.interface_id FROM `interfaces` AS I, `devices` AS D WHERE `ifDescr` = '$dst_if' AND hostname = '$dst_host' AND D.device_id = I.device_id"), 0);
+      $src_if_id   = mysql_result(mysql_query("SELECT I.interface_id FROM `interfaces` AS I, `devices` AS D WHERE `ifDescr` = '$src_if' AND hostname = '$src_host' AND D.device_id = I.device_id"), 0);
       $linkalive[] = $src_if_id . "," . $dst_if_id;
       if ( mysql_result(mysql_query("SELECT COUNT(*) FROM `links` WHERE `dst_if` = '$dst_if_id' AND `src_if` = '$src_if_id'"),0) == '0') 
       {