Changeset 223 for trunk/is/topologie-gen.php

Timestamp:

May 31, 2009, 9:10:43 PM (16 years ago)

Author:

hajdam

Message:

Oprava chybného ID

File:

• trunk/is/topologie-gen.php (modified) (4 diffs)

trunk/is/topologie-gen.php

@@ -70 +70 @@
     $this->border[0]=0;
     $mark = array();
+    $markskip = 0;
 
     do {
@@ -75 +76 @@
         $query = 'SELECT dev.id AS id FROM NetworkDevice dev WHERE dev.name = "'.$TopHostName.'" LIMIT 0,1';
       } else {
-        $query = 'SELECT trg.id AS id FROM NetworkDevice dev, NetworkInterface ifc, NetworkLink lnk, NetworkInterface trg WHERE ifc.device = dev.id AND lnk.interface2 = ifc.id AND lnk.interface1 = trg.id AND dev.used=1 AND ';
+        $query = 'SELECT trg.device AS id FROM NetworkDevice dev, NetworkInterface ifc, NetworkLink lnk, NetworkInterface trg WHERE ifc.device = dev.id AND lnk.interface2 = ifc.id AND lnk.interface1 = trg.id AND dev.used=1 AND ';
         $query .= ' dev.id = '.$parentNode->index.' ORDER BY id';
-        $query .= ' LIMIT '.count($parentNode->children).',1';
+        $query .= ' LIMIT '.(count($parentNode->children)+$markskip).',1';
       }
       $DbResult = $Database->query($query);
       $item = $DbResult->fetch_array();
       if ($item) {
-//        echo $item['id'].'<br/>';
+//        echo $item['id'].','.$parentNode->index.','.$level.'<br/>';
 //        flush();
         if (!isset($mark[$item['id']])) {
@@ -99 +100 @@
           $level++;
           $this->border[$level] = 0;
+          $markskip = 0;
+        } else {
+          $markskip++;
         }
       } else {
@@ -104 +108 @@
         $parentNode = $currentNode->parentItem;
         $level--;
+        $markskip = 0;
       }
     } while($level >= 1);