Improve iteration on process nodes (for #6284)

Benjamin Renard
1 parent 029d9224
Showing 1 changed file with 21 additions and 4 deletions Show diff stats
src/Request/ProcessRequestImpl/Process/ProcessManagerClass.php
@@ -241,6 +241,17 @@ class ProcessManagerClass
 		return $process;
 	}
+	// Next element sibling for DOMElement
+	function fNextEltSibling($node) {
+		while ($node && ($node = $node->nextSibling)) {
+			if ($node instanceof DOMElement) {
+				break;
+			}
+		}
+		return $node;
+	}
+
+
 	/*
 	 * @brief Get information about a process
 	*/
@@ -250,7 +261,8 @@ class ProcessManagerClass
 		$update = $args['update'];
 		$processNodes = $dom->documentElement->getElementsByTagName("process");
-		foreach ($processNodes as $processNode)
+		$processNode = $processNodes->item(0);
+		while ($processNode)
 		{
 			if ($processNode->getAttribute('xml:id') == $id)
 			{
@@ -269,6 +281,7 @@ class ProcessManagerClass
 				return array('success' => true, 'result' => $processInfo);
 			}
+			$processNode = $this->fNextEltSibling($processNode);
 		}
 		return array('success' => false, 'message' => 'Cannot get process from id');
@@ -280,7 +293,8 @@ class ProcessManagerClass
 	private function deleteProcessFromId($dom, $id)
 	{
 		$processNodes = $dom->documentElement->getElementsByTagName("process");
-		foreach ($processNodes as $processNode)
+		$processNode = $processNodes->item(0);
+		while ($processNode)
 		{
 			if ($processNode->getAttribute('xml:id') == $id)
 			{
@@ -296,6 +310,7 @@ class ProcessManagerClass
 				return array('success' => true);
 			}
+			$processNode = $this->fNextEltSibling($processNode);
 		}
 		return array('success' => false, 'message' => 'Cannot get process from id');
@@ -307,7 +322,8 @@ class ProcessManagerClass
 	private function killProcessFromId($dom, $id)
 	{
 		$processNodes = $dom->documentElement->getElementsByTagName("process");
-		foreach ($processNodes as $processNode)
+		$processNode = $processNodes->item(0);
+		while ($processNode)
 		{
 			if ($processNode->getAttribute('xml:id') == $id)
 			{
@@ -326,10 +342,11 @@ class ProcessManagerClass
 				}
 				return array('success' => false, 'message' => 'Cannot process from id');
 			}
+			$processNode = $this->fNextEltSibling($processNode);
 		}
 		return array('success' => false, 'message' => 'Cannot kill process from id '.$id);
 	}
 }
-?>
 \ No newline at end of file
+?>