Changeset 921 for trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

Timestamp:

Feb 25, 2022, 9:30:55 AM (3 years ago)

Author:

chronos

Message:

• Modified: NetworkSignal MAC column transformed into separate table NetworkMac.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (4 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -39 +39 @@
     $Read = $Routerboard->Read(false);
     $Array = $Routerboard->ParseResponse($Read);
+    $NetworkMac = new NetworkMac($this->System);
     foreach ($Array as $Properties)
     {
@@ -75 +76 @@
       $RateRx = $this->StripUnits($Properties['rx-rate']);
       $RateTx = $this->StripUnits($Properties['tx-rate']);
+      $MacRef = $NetworkMac->GetIndex($Properties['mac-address']);
       $Queries[] = 'INSERT INTO `NetworkSignal` (`MAC`, `Value`, `Remote`, `RateRx`, `RateTx`, `Time`, `Interface`, `Device`) VALUES '.
-        '("'.$Properties['mac-address'].'", '.$Strength.', '.$RemoteSignal.', '.$RateRx.', '.$RateTx.', "'.
+        '('.$MacRef.', '.$Strength.', '.$RemoteSignal.', '.$RateRx.', '.$RateTx.', "'.
         TimeToMysqlDateTime($this->Time).'", '.$Interface.', '.$Device['Id'].')';              
     }
@@ -98 +100 @@
       return array();
     }    
+    $NetworkMac = new NetworkMac($this->System);
     foreach ($Array as $Properties)
     {
@@ -119 +122 @@
 
       $RateTx = $this->StripUnits($Properties['tx-phy-rate']);
+      
+      $MacRef = $NetworkMac->GetIndex($Properties['remote-address']);
       $Queries[] = 'INSERT INTO `NetworkSignal` (`MAC`, `Value`, `Remote`, `RateRx`, `RateTx`, `Time`, `Interface`, `Device`) VALUES '.
-        '("'.$Properties['remote-address'].'", '.$Strength.', 0, 0, '.round($RateTx / 1000000).', "'.
+        '('.$MacRef.', '.$Strength.', 0, 0, '.round($RateTx / 1000000).', "'.
         TimeToMysqlDateTime($this->Time).'", '.$Interface.', '.$Device['Id'].')';              
     }