Keep in cache result of expression parser

Benjamin Renard
1 parent 1457bf10
Showing 1 changed file with 13 additions and 5 deletions Show diff stats
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
@@ -11,6 +11,8 @@ class IHMParamManagerClass
 	protected $templateParamsManager = null;
 	protected $paramImpexMgr     = null;
 	protected $ttCatMgr = null;
+
+	protected $cacheExpressionParser = null;
  
 	/*
 	 * @brief Constructor
@@ -18,6 +20,7 @@ class IHMParamManagerClass
 	function __construct()
 	{
 		$this->templateParamsManager = new IHMParamTemplateClass();
+		$this->cacheExpressionParser = array();
 	}
  
 	public function addGeneratedParam($paramId, $expression, $sampling, $paramsData)
@@ -276,12 +279,13 @@ class IHMParamManagerClass
 	*/
 	private function addDerivedParam($param,$paramsData)
 	{
+		$time = time();
 		if (!isset($this->userParameterLoader))
 			$this->userParameterLoader = new IHMUserParamLoaderClass();
  
 		//get derived parameter info
 		$res = $this->userParameterLoader->getDerivedParameterFromName($param);
-		
+
 		if (!$res["success"])
 			throw new Exception('Error to load derived parameter file : '.$res["message"]);
  
@@ -299,7 +303,7 @@ class IHMParamManagerClass
 				$expressionInfo['params'], $res["param"]["timestep"],
 				0,$res["param"]["dateModif"],!empty($res["param"]["info"]["units"]) ? $res["param"]["info"]["units"] : "",
 				!empty($res["param"]["info"]["yTitle"]) ? $res["param"]["info"]["yTitle"] : "", $paramsData);
-		
+
 		return array("id" => $paramId, "indexes" => array(), "calib_infos" => array());
 	}
  
@@ -675,6 +679,10 @@ class IHMParamManagerClass
 	}
  
 	public function parseExpression($expression, $workingDir) {
+		$outputFileName = "parser_".md5($expression).".xml";
+		if (array_key_exists($outputFileName, $this->cacheExpressionParser)) {
+			return $this->cacheExpressionParser[$outputFileName];
+		}
 		$parserData = new ParserRequestDataClass();
 		$parserData->setManagerFilePath(IHMConfigClass::getProcessManagerFilePath());
 		$parserData->addExpression($expression);
@@ -683,8 +691,7 @@ class IHMParamManagerClass
 		$parserData->setConstantsFilePath(IHMConfigClass::getConstantsFilePath());
 		$parserData->setFunctionsFilePath(IHMConfigClass::getFunctionsFilePath());
 		$parserData->setParamTemplatesFilePath(IHMConfigClass::getParamTemplateListFilePath());
-		$outputFileName = "parser_".md5($expression).".xml";
-		$parserData->setOutputFileName("parser_".md5($expression).".xml");
+		$parserData->setOutputFileName($outputFileName);
 		$resultFilePath = $workingDir."/".$outputFileName;
  
 		$parserRequest = new ParserRequestClass();
@@ -776,6 +783,7 @@ class IHMParamManagerClass
 			}
 		}
  
-		return array('success' => TRUE, 'expression' => $kernelExpression, 'params' => $params);
+		$this->cacheExpressionParser[$outputFileName] = array('success' => TRUE, 'expression' => $kernelExpression, 'params' => $params);
+		return $this->cacheExpressionParser[$outputFileName];
 	}
 }