Changeset 697

Timestamp:

Sep 24, 2014, 12:40:54 PM (10 years ago)

Author:

chronos

Message:

• Opraveno: U nově vložených položek stavu rozhraní se určuje trvání stavu do budoucna. V předchozím commitu se chybně počítalo trvání do minulosti.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 696; // Subversion revision
-$DatabaseRevision = 696; // SQL structure revision
-$ReleaseTime = strtotime('2014-09-23');
+$Revision = 697; // Subversion revision
+$DatabaseRevision = 697; // SQL structure revision
+$ReleaseTime = strtotime('2014-09-24');

trunk/Common/Setup/Updates.php

@@ -920 +920 @@
 }
 
+function UpdateTo697($Manager)
+{
+        $Manager->Execute('ALTER TABLE `NetworkInterfaceUpDown` CHANGE `Duration` `Duration` INT( 11 ) NULL ;');
+        $Manager->Execute('UPDATE `NetworkInterfaceUpDown` SET `Duration` = NULL');
+        $Manager->Execute('UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND,
+    `TM`.`Time`, (SELECT `Time` FROM (SELECT * FROM `NetworkInterfaceUpDown`) AS `TA` WHERE (`TA`.`Time` > `TM`.`Time`)
+    AND (`TA`.`Interface`=`TM`.`Interface`) ORDER BY `TA`.`Time` ASC LIMIT 1))');
+}
 
 class Updates
@@ -972 +980 @@
       688 => array('Revision' => 692, 'Function' => 'UpdateTo692'),
       692 => array('Revision' => 696, 'Function' => 'UpdateTo696'),
+      696 => array('Revision' => 697, 'Function' => 'UpdateTo697'),
     ));
   }

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -57 +57 @@
     {
         // Online state changed
-      $System->Database->query('INSERT INTO `NetworkInterfaceUpDown` (`Interface`,
+      $DbResult = $System->Database->query('INSERT INTO `NetworkInterfaceUpDown` (`Interface`,
         `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
-         TimeToMysqlDateTime($StartTime).'", IFNULL(TIMESTAMPDIFF(SECOND, '.
-         '(SELECT `Time` FROM `NetworkInterfaceUpDown` AS `TA` WHERE (`TA`.`Time` < "'.TimeToMysqlDateTime($StartTime).'") '.
-         'AND (`TA`.`Interface`='.$Interface['Id'].') ORDER BY `TA`.`Time` DESC LIMIT 1), "'.TimeToMysqlDateTime($StartTime).'"), 0))');
-      echo($System->Database->LastQuery."\n");
+         TimeToMysqlDateTime($StartTime).'", NULL)');
+      // Update previous record duration in UpDown table
+      $System->Database->query('UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND, '.
+      '`TM`.`Time`, (SELECT `Time` FROM (SELECT * FROM `NetworkInterfaceUpDown`) AS `TA` WHERE (`TA`.`Time` > `TM`.`Time`) '.
+      'AND (`TA`.`Interface`=`TM`.`Interface`) ORDER BY `TA`.`Time` ASC LIMIT 1)) '.
+        'WHERE (`TM`.`Duration` IS NULL) AND (`TM`.`Interface` ='.$Interface['Id'].')');
       $System->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
         array('Online' => $Interface['NewOnline']));