Integration part to treate a TT/Cat like a parameter

Erdogan Furkan
1 parent c0008d6e
Showing 2 changed files with 39 additions and 3 deletions Show diff stats
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
src/InputOutput/IHMImpl/Tools/IHMTTCatLoaderClass.php
@@ -46,6 +46,8 @@ class IHMParamManagerClass
 			return $this->addUploadedParam($param,$paramsData);
 		else if ($this->isImpexParam($param))
 			return $this->addImpexParam($param,$paramsData,$templateArgs);	
+		else if($this->isTTCatParam($param))
+			return $this->addTTCatParam($param,$paramsData);
 		else
 			return $this->addLocalParam($param,$paramsData,$templateArgs, $tableLink);
 		return "";
@@ -84,7 +86,17 @@ class IHMParamManagerClass
 		$info = $this->ttCatMgr->getTTCatInfoFromId($paramId);
 		if (!$info["success"]) {
-			throw new Exception($info["message"]);
+			$paramName = $paramId;
+			foreach(array("tt_","cat_","sharedtimeTable_","sharedcartalog_") as $prefix){
+				if(strpos($paramName, $prefix) === 0){
+					$paramName = substr($paramName, strlen($prefix));
+					break;
+				}
+			}
+			$info = $this->ttCatMgr->getTTCatInfoFromName($paramName);
+			if (!$info["success"]) {
+				throw new Exception($info["message"]);
+			}
 		}
 		$status = array();
@@ -93,9 +105,9 @@ class IHMParamManagerClass
 		$flag = "";
 		if ($info["info"]["isCatalog"]) {
-			$parameters = $this->ttCatMgr->getCatalogParameters($paramId);
+			$parameters = $this->ttCatMgr->getCatalogParameters($info["info"]["id"]);
 			if (!$parameters["success"] || empty($parameters["parameters"])) {
-				throw new Exception("Error to extract first parameter of ".$paramId);
+				throw new Exception("Error to extract first parameter of ".$info["info"]["id"]);
 			}
 			//For the moment, use the first parameter
 			$parameter = $parameters["parameters"][0];
@@ -173,6 +185,15 @@ class IHMParamManagerClass
 	}
 	/*
+	 * @brief Detect if it's a TT/Cat parameter
+	*/
+	private function isTTCatParam($param)
+	{
+		return preg_match("#^tt_#",$param) || preg_match("#^cat_#",$param) || 
+			   preg_match("#^sharedtimeTable_#",$param) || preg_match("#^sharedcatalog_#",$param);
+	}
+
+	/*
 	 * @brief Detect if it's a uploaded parameter
 	*/
 	public function isUploadedParam($param)
@@ -61,6 +61,21 @@ class IHMTTCatLoaderClass
 	}
 	/*
+	 * @brief Get info about a TT or a catalog from name
+	 */
+	public function getTTCatInfoFromName($name)
+	{
+		if (!isset($this->ttCatList)) {
+			$this->ttCatList = $this->loadTTCatManagerFiles();
+		}
+		foreach($this->ttCatList as $value){
+			if($value['name'] == $name)
+				return array("success" => true, "info" => $value);
+		}
+		return array("success" => false, "message" => "Cannot retrieve TT or catalog");
+	}
+
+	/*
 	 * @brief Get parameters from id (empty for a TT)
 	 */
 	public function getCatalogParameters($id)