mkrieger/patchcablemgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.14

Browse Source
This commit is contained in:
Garrett K 2021-02-24 05:33:00 +00:00
parent aa823314e4
commit 27b10e836a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
includes/content-path2.php
View File

@ -61,19 +61,19 @@ function crawlConnSet(&$qls, $objID, $objFace, $objDepth, $objPort, &$connSetID=
'objPort' => $objPort, 'objPort' => $objPort,
); );
error_log('Debug: '.$objID.'-'.$objFace.'-'.$objDepth.'-'.$objPort); // Add port info to connection set
error_log('Debug (inventoryArray): '.json_encode($qls->App->inventoryArray[$objID][$objFace][$objDepth][$objPort])); array_push($connSet[$connSetID], $workingArray);
// Is local port connected? // Is local port connected?
if(isset($qls->App->inventoryArray[$objID][$objFace][$objDepth][$objPort])) { if(isset($qls->App->inventoryArray[$objID][$objFace][$objDepth][$objPort])) {
// Flip the connection set ID // Flip the connection set ID
$connSetID = ($connSetID == 0) ? 1 : 0; $connSetID = ($connSetID == 0) ? 1 : 0;
error_log('here5');
// Loop over each local port connection // Loop over each local port connection
$inventoryEntry = $qls->App->inventoryArray[$objID][$objFace][$objDepth][$objPort]; $inventoryEntry = $qls->App->inventoryArray[$objID][$objFace][$objDepth][$objPort];
foreach($inventoryEntry as $connection) { foreach($inventoryEntry as $connection) {
error_log('here2');
// Collect remote object data // Collect remote object data
$remoteObjID = $connection['id']; $remoteObjID = $connection['id'];
$remoteObjFace = $connection['face']; $remoteObjFace = $connection['face'];
@ -83,9 +83,7 @@ function crawlConnSet(&$qls, $objID, $objFace, $objDepth, $objPort, &$connSetID=
// Verify this node has not been visited already // Verify this node has not been visited already
$alreadySeen = false; $alreadySeen = false;
foreach($connSet as $conn) { foreach($connSet as $conn) {
error_log('here3');
foreach($conn as $port) { foreach($conn as $port) {
error_log('here4');
if($port['objID'] == $remoteObjID and $port['objFace'] == $remoteObjFace and $port['objDepth'] == $remoteObjDepth and $port['objPort'] == $remoteObjPort) { if($port['objID'] == $remoteObjID and $port['objFace'] == $remoteObjFace and $port['objDepth'] == $remoteObjDepth and $port['objPort'] == $remoteObjPort) {
$alreadySeen = true; $alreadySeen = true;
} }
@ -93,14 +91,13 @@ function crawlConnSet(&$qls, $objID, $objFace, $objDepth, $objPort, &$connSetID=
} }
if(!$alreadySeen) { if(!$alreadySeen) {
error_log('Debug: '.$remoteObjID.'-'.$remoteObjFace.'-'.$remoteObjDepth.'-'.$remoteObjPort);
crawlConnSet($qls, $remoteObjID, $remoteObjFace, $remoteObjDepth, $remoteObjPort, $connSetID, $connSet); crawlConnSet($qls, $remoteObjID, $remoteObjFace, $remoteObjDepth, $remoteObjPort, $connSetID, $connSet);
} }
} }
// Add port info to connection set
error_log('here1');
array_push($connSet[$connSetID], $workingArray);
} }
return $connSet; return $connSet;