Store template args in parsed expression saved in cache

Benjamin Renard
1 parent 9cce1f21
Showing 2 changed files with 56 additions and 17 deletions Show diff stats
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
src/InputOutput/IHMImpl/Tools/IHMUserParamManagerClass.php
@@ -304,12 +304,7 @@ class IHMParamManagerClass
 			if (!$expressionInfo['success']) {
 				throw new Exception($expressionInfo['message']);
 			}
-
-			$paramsList = array();
-			foreach ($expressionInfo['params'] as $p) {
-				$paramsList[] = $p["paramid"];
-			}
-			$this->userParameterMgr->saveDerivedParameterParsedExpression($res["param"]["id"], $expressionInfo["expression"], md5($res["param"]["expression"]), $paramsList);
+			$this->userParameterMgr->saveDerivedParameterParsedExpression($res["param"]["id"], $expressionInfo["expression"], md5($res["param"]["expression"]), $expressionInfo['params']);
 		}
 		$paramId = $param;
@@ -23,7 +23,10 @@ class IHMUserParamManagerClass
 	private static $infoDerivedParsedExpNode      = 'parsedExp';
 	private static $infoDerivedParsedExpValAtt    = 'exp';
 	private static $infoDerivedParsedExpHashAtt   = 'hash';
-	private static $infoDerivedParsedExpParamsAtt = 'params';
+	private static $infoDerivedParsedExpParamNode    = 'param';
+	private static $infoDerivedParsedExpParamIdAtt = "paramid";
+	private static $infoDerivedParsedExpParamArgNode = 'arg';
+	private static $infoDerivedParsedExpParamArgNameAtt = 'name';
 	private static $infoDerivedSamplingModeNode   = 'sampling_mode';
 	private static $infoDerivedTimeStepNode       = 'timestep';
 	private static $infoDerivedRefParamNode       = 'reference_param';
@@ -330,18 +333,42 @@ class IHMUserParamManagerClass
 			$parsedExpNode    = $parsedExpNodes->item(0);
 			$parsedExpVal     = $parsedExpNode->getAttribute(self::$infoDerivedParsedExpValAtt);
 			$parsedExpHash    = $parsedExpNode->getAttribute(self::$infoDerivedParsedExpHashAtt);
-			$parsedExpParams  = $parsedExpNode->getAttribute(self::$infoDerivedParsedExpParamsAtt);
-			if (!empty($parsedExpVal) && !empty($parsedExpParams) && (md5($paramExpression) == $parsedExpHash)) {
+			$parsedExpParamNodes = $parsedExpNode->getElementsByTagName(self::$infoDerivedParsedExpParamNode);
+			if (!empty($parsedExpVal) && !empty($parsedExpParams) && !empty($parsedExpParamNodes) && (md5($paramExpression) == $parsedExpHash)) {
+				$error = FALSE;
 				$params = array();
-				foreach (explode(',',$parsedExpParams) as $param) {
-					$params[] = array(
-						'paramid' => $param,
+				foreach ($parsedExpParamNodes as $parsedExpParamNode) {
+					$parsedParamId = $parsedExpParamNode->getAttribute(self::$infoDerivedParsedExpParamIdAtt);
+					if (empty($parsedParamId)) {
+						$error = TRUE;
+						break;
+					}
+					$param_to_add = array(
+						'paramid' => $parsedParamId,
+					);
+					$parsedExpParamArgNodes = $parsedExpParamNode->getElementsByTagName(self::$infoDerivedParsedExpParamArgNode);
+					if (!empty($parsedExpParamArgNodes)) {
+						$param_to_add['template_args'] = array();
+						foreach ($parsedExpParamArgNodes as $parsedExpParamArgNode) {
+							$attName = $parsedExpParamArgNode->getAttribute(self::$infoDerivedParsedExpParamArgNameAtt);
+							if (empty($attName)) {
+								$error = TRUE;
+								break;
+							}
+							$param_to_add['template_args'][$attName] = $parsedExpParamArgNode->nodeValue;
+						}
+						if ($error) {
+							break;
+						}
+					}
+					$params[] = $param_to_add;
+				}
+				if (!$error) {
+					$result['parsedExpression'] = array(
+						"expression" => $parsedExpVal,
+						"params"     => $params,
 					);
 				}
-				$result['parsedExpression'] = array(
-					"expression" => $parsedExpVal,
-					"params"     => $params,
-				);
 			}
 		}
@@ -462,11 +489,28 @@ class IHMUserParamManagerClass
 		}
 		else {
 			$parsedExpNode = $parsedExpNodes->item(0);
+			while ($parsedExpNode->hasChildNodes()) {
+				$parsedExpNode->removeChild($parsedExpNode->firstChild);
+			}
 		}
+		
 		$parsedExpNode->setAttribute(self::$infoDerivedParsedExpValAtt, $expression);
 		$parsedExpNode->setAttribute(self::$infoDerivedParsedExpHashAtt, $hash);
-		$parsedExpNode->setAttribute(self::$infoDerivedParsedExpParamsAtt, implode(',',$params));
+
+		foreach ($params as $param) {
+			$paramNode = $dom->createElement(self::$infoDerivedParsedExpParamNode);
+			$paramNode->setAttribute(self::$infoDerivedParsedExpParamIdAtt, $param['paramid']);
+			$parsedExpNode->appendChild($paramNode);
+			if (!empty($param['template_args'])) {
+				foreach ($param['template_args'] as $arg_name => $arg_value) {
+					$argNode = $dom->createElement(self::$infoDerivedParsedExpParamArgNode);
+					$argNode->setAttribute(self::$infoDerivedParsedExpParamArgNameAtt, $arg_name);
+					$argNode->nodeValue = $arg_value;
+					$paramNode->appendChild($argNode);
+				}
+			}
+		}
 		$dom->save($path);