Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_Integration

Hacene SI HADJ MOHAND
2 parents 6e8d82dc e4eba677
Showing 20 changed files with 837 additions and 142 deletions Show diff stats
config/plotConfig.xml
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/InputOutput/IHMImpl/TimeTables/IHMInputOutputTTClass.php
src/InputOutput/IHMImpl/Tools/IHMExpressionParserClass.php
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
src/InputOutput/IHMImpl/Tools/IHMTTCatLoaderClass.php
src/InputOutput/WSImpl/Params/DownloadImpl/WSInputOutputParamsDownloadClass.php
src/InputOutput/WSImpl/Tools/WSJobsManagerClass.php
src/Request/ParamsRequestImpl/Nodes/Infos/InfoParamNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Params/ParamGetConstantNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Params/ParamGetConstantParamNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Params/ParamNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotYSerieNodeClass.php
src/Request/ParamsRequestImpl/ParamsRequestDataClass.php
src/Request/ProcessRequestImpl/Process/ProcessClass.php
src/Request/ProcessRequestImpl/Process/ProcessManagerClass.php
src/Request/ProcessRequestImpl/ProcessRequestClass.php
src/Request/ProcessRequestImpl/ProcessRequestDataClass.php
src/Request/TTRequestImpl/TTRequestDataClass.php
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-	<default>
-		<page dimension="ISO A4" orientation="landscape" mode="color" dpi="90">
-			<font name="sans-serif" size="8" />
-			<margin x="5" y="5" /> <!-- in mm -->
-		</page>
-		<panel resolution="3000" backgroundColor="[255,255,255]"> <!-- charSizeUnits defines space to set all around plot area -->
-			<title position="top" align="center" />
-			<timeAxis id="timeAxis" format="dd/mm/yy" reverse="false" color="[0,0,0]" position="bottom" thickness="1">
-				<legend text="Time, UT" />
-			</timeAxis>
-			<epochAxis id="epochAxis" format="dd/mm/yy" reverse="false" color="[0,0,0]" position="bottom" thickness="1">
-				<legend text="Relative Time" />
-			</epochAxis>
-			<colorAxis id="colorAxis" scale="linear" color="[0,0,0]" reverse="false" position="right" />
-			<xAxis scale="linear" reverse="false" color="[0,0,0]" position="bottom" thickness="1" />
-			<yAxis scale="linear" reverse="false" color="[0,0,0]" position="left" thickness="1" />
-			<timePlot xAxis="timeAxis" zAxis="colorAxis">
-				<line type="line" style="plain" width="1" />
-				<symbol type="no" size="4" />
-			</timePlot>
-			<epochPlot xAxis="epochAxis" zAxis="colorAxis">
-				<line type="line" style="plain" width="1" />
-				<symbol type="no" size="4" color="[0,0,255]" />
-			</epochPlot>
-			<xyPlot zAxis="colorAxis">
-				<line type="no" style="plain" width="1" />
-				<symbol type="dot" size="4"  />
-				<resampling type="auto"/>
-				<timeTick step="0" number="0" minor="0" color="[0,0,0]">
-					<font name="sans-serif" size="5" style="upright" weight="medium" />
-					<firstSymbol type="triangle" size="5" color="[120,0,0]" />
-					<symbol type="circle" size="5" color="[120,120,0]" />
-				</timeTick>
-			</xyPlot>
-			<instantPlot zAxis="colorAxis">
-				<line type="no" style="plain" color="[255,0,0]" width="1" />
-				<symbol type="dot" size="4" color="[0,0,255]" />
-			</instantPlot>
-		</panel>
-	</default>
-	<colormap path="plplot/">
-		<grayscale default="0"> <!-- default is map index used for auto line color generation -->
-			<file index="0">cmap0_black_on_white.pal</file>
-			<file index="1">cmap1_gray.pal</file>
-		</grayscale>
-		<color default="0">
-			<file index="0">cmap0_default.pal</file>
-			<file index="1">cmap1_default.pal</file>
-			<file index="2">cmap0_test.pal</file>
-		</color>
-		<coloraxis default="0">
-			<file index="0">cmap1_default.pal</file>
-			<file index="1">cmap1_blue_red.pal</file>
-			<file index="2">cmap1_blue_yellow.pal</file>
-			<file index="3">cmap1_gray.pal</file>
-		</coloraxis>
-	</colormap>
-</root>
@@ -387,7 +387,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		//Panel background color
 		if (($panelData->{'panel-background-color'} != 'none') && ($panelData->{'panel-background-color'} != ''))
 			$panelNode->setBackgroundColor($this->hexColor2KernelColor($panelData->{'panel-background-color'}));
-		
+
 		//Panel font
 		$this->unmarshallFont($panelData, 'panel-font', $panelNode->getFont());
@@ -679,8 +679,15 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		$drawingEltIndex = 0;
 		foreach ($paramsData as $paramData)
 		{
+			$isTTCat = ($paramData->{'param-type'} == 'ttcat');
+
 			//Param
-			$paramInfo = $this->paramManager->addExistingParam($paramData->{'paramid'}, $this->paramsData, isset($paramData->{'template_args'}) ? $paramData->{'template_args'} : NULL);
+			if (!$isTTCat) {
+				$paramInfo = $this->paramManager->addExistingParam($paramData->{'paramid'}, $this->paramsData, isset($paramData->{'template_args'}) ? $paramData->{'template_args'} : NULL);
+			}
+			else {
+				$paramInfo = $this->paramManager->addTTCatParam($paramData->{'paramid'}, $this->paramsData);
+			}
 			$paramInfo['indexes'] = array();
@@ -730,7 +737,11 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				case 'ispectro' :
 					$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
 					$this->unmarshallInstantSpectro($paramData->{'param-drawing-object'}, $plotNode, $paramNode, $paramInfo['indexes']);
-					break;	
+					break;
+				case 'intervals' :
+					$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
+					$this->unmarshallIntervals($paramData->{'param-drawing-object'}, $paramNode);
+					break;
 				default :
 					throw new Exception('Drawing type not implemented.');
 			}
@@ -784,6 +795,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			{
 				$serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, -1, $xId, $colorSerieId, $paramData->{'param-drawing-object'}->{'serie-value-min'}, $paramData->{'param-drawing-object'}->{'serie-value-max'});
 				$serieNode->setId($paramData->{'id'});
+				if (!empty($paramData->{'param-drawing-object'}->{'serie-resolution'}))
+					$serieNode->setResolution($paramData->{'param-drawing-object'}->{'serie-resolution'});
 				$serieNodes[] = $serieNode;
 			}
 			foreach ($indexes as $index)
@@ -791,6 +804,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				$serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, $index, $xId, $colorSerieId, $paramData->{'param-drawing-object'}->{'serie-value-min'}, $paramData->{'param-drawing-object'}->{'serie-value-max'});
 				if (count($indexes) == 1)
 					$serieNode->setId($paramData->{'id'});
+				if (!empty($paramData->{'param-drawing-object'}->{'serie-resolution'}))
+					$serieNode->setResolution($paramData->{'param-drawing-object'}->{'serie-resolution'});
 				$serieNodes[] = $serieNode;
 			}
 		}
@@ -1002,7 +1017,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 	protected function unmarshallSpectro($paramDrawingData, $plotNode, $paramNode, $indexes)
 	{
-		$spectroNode = $paramNode->addSpectro($paramDrawingData->{'spectro-yaxis'}, count($indexes) > 0 ? $indexes[0] : NULL, $paramDrawingData->{'spectro-value-min'}, $paramDrawingData->{'spectro-value-max'}, isset($paramDrawingData->{'spectro-log0-as-min'}) ? $paramDrawingData->{'spectro-log0-as-min'} : false);
+		$spectroNode = $paramNode->addSpectro($paramDrawingData->{'spectro-yaxis'}, empty($paramDrawingData->{'spectro-resolution'}) ? NULL : $paramDrawingData->{'spectro-resolution'}, count($indexes) > 0 ? $indexes[0] : NULL, $paramDrawingData->{'spectro-value-min'}, $paramDrawingData->{'spectro-value-max'}, isset($paramDrawingData->{'spectro-log0-as-min'}) ? $paramDrawingData->{'spectro-log0-as-min'} : false);
 	}
 	protected function unmarshallInstantSpectro($paramDrawingData, $plotNode, $paramNode, $indexes)
@@ -1018,6 +1033,11 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		foreach ($indexes as $index)
 			$paramNode->addStatusBar($index);
 	}
+
+	protected function unmarshallIntervals($paramDrawingData, $paramNode)
+	{
+		$paramNode->addIntervals();
+	}
 	protected function unmarshallTickBar($paramDrawingData, $paramNode, $indexes)
 	{
@@ -1483,9 +1503,10 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 						'success'     => true,
 						'killed'      => true);
 			default :
+				$errorMsg = $data->getErrorMsg();
 				return array(
 				'success' => false,
-				'message'   => 'Request processing error');
+				'message'   => 'Request processing error'.(!empty($errorMsg) ? "<br>(".$errorMsg.")" : ""));
 		}
 	}
@@ -23,6 +23,10 @@ class IHMInputOutputTTClass implements InputOutputInterface
 	{
 		if (isset($this->processDatas))
 			unset($this->processDatas);
+
+		$sendToSamp = isset($input->sendToSamp) && $input->sendToSamp;
+		$compression = !$sendToSamp && ($input->compression !== 'none');
+		$format = $sendToSamp ? 'vot' : $input->fileformat;
 		$final = "";
@@ -35,15 +39,17 @@ class IHMInputOutputTTClass implements InputOutputInterface
 		{
 			//create a list of data to treat
 			$processData = new TTRequestDataClass();
-			if (strpos($tt->id,"sharedtimeTable_") === 0) {
-				//Shared TimeTable
-				$result = IHMSharedObjectsClass::getPath("timeTable", $tt->id);
+			
+			if (strpos($tt->id,"sharedtimeTable_") === 0 || strpos($tt->id,"sharedcatalog_") === 0) {
+				//Shared TimeTable /Catalog
+				$objectType = strpos($tt->id,"timeTable") != 0 ? "timeTable" : "catalog";
+				$result = IHMSharedObjectsClass::getPath($objectType, $tt->id);
 				if (!$result['success'])
-					throw new Exception('Shared TimeTable '.$tt->name.' not found');
+					throw new Exception('Shared '.$objectType.' '.$tt->name.' not found');
 				$ttName = $result['path'];
 			}
 			else {
-				//User TimeTable
+				//User TimeTable / Catalog
 				$ttName = IHMConfigClass::getUserTTPath().$tt->id.'.xml';
 			}
 			if (!file_exists($ttName))
@@ -52,7 +58,7 @@ class IHMInputOutputTTClass implements InputOutputInterface
 			$processData->setInputFileFormat(TTRequestFileFormatEnum::INTERNAL);			 
 			$processData->setOutputDir(IHMConfigClass::getDownloadTmpPath());
-			switch ($input->fileformat) {
+			switch ($format) {
 				case 'vot' :	
 					$processData->setOutputFileFormat(TTRequestFileFormatEnum::VOTABLE);
 					$outputName = $tt->name.'.xml';
@@ -67,6 +73,7 @@ class IHMInputOutputTTClass implements InputOutputInterface
 			$final .= " ".$outputName;
 			$processData->setType($function);
 			$processData->setCmd("ttConversion");
+			$processData->setSendToSamp($sendToSamp);
 			$this->processDatas[] = $processData;
 		}
@@ -74,7 +81,7 @@ class IHMInputOutputTTClass implements InputOutputInterface
 		$this->postProcessTT = new PostProcessTTClass();
 		$this->postProcessTT->setOutputDirAlias($this->processDatas[0]->getOutputDir());
-		if ($input->compression !== 'none') {
+		if ($compression) {
 			$this->postProcessTT->compression = true;
 			$archive = "Timetable_archive_".date('Ymd_Hi');
 			switch ($input->compression) {
@@ -125,6 +132,14 @@ class IHMInputOutputTTClass implements InputOutputInterface
 		}
+		else if ($data[0]->getSendToSamp()) {
+			$donwload = array();
+			foreach ($data as $d) {
+				$donwload[] = $this->postProcessTT->getOutputDirAlias().$d->getOutputFileName();
+			}
+			$result  = array('success'=>$data[0]->getSuccess(), 'sendToSamp' => TRUE,
+				'download' => $donwload);
+		}
 		else {
 			$result  = array('success'=>$data[0]->getSuccess(), 
 				'download' => $this->postProcessTT->getOutputDirAlias().$data[0]->getOutputFileName());
@@ -85,6 +85,8 @@ class IHMExpressionParserClass
 				"2/abs(1+dst)" => array("expression" => "2/(abs(1+\$dst))", "params" => array(array("paramid" => "dst"))),
 				"cross(vect_1,vect_2)"  => array("expression" => "(cross(\$vect_1,\$vect_2))", "params" => array(array("paramid" => "vect_1"), array("paramid" => "vect_2"))),
 				"cross(cross(vect_1,vect_2),vect_3)"  => array("expression" => "(cross((cross(\$vect_1,\$vect_2)),\$vect_3))","params" => array(array("paramid" => "vect_1"), array("paramid" => "vect_2"), array("paramid" => "vect_3"))),
+				"c1_hia_pad(0,0)/c1_hia_pad(0,1)" => array ("expression" => "\$c1_hia_pad[0][0]/\$c1_hia_pad[0][1]", "params" => array(array("paramid" => "c1_hia_pad"))),
+				"cass_caps_elssec4(indexes[0,10])" => array("expression" => "\$sum_into_table_indexes_cass_caps_elssec4_0_0_10", "params" => array(array("paramid" => "sum_into_table_indexes", "fullparamid" => "sum_into_table_indexes_cass_caps_elssec4_0_0_10", "template_args" => array("paramid"=>"cass_caps_elssec4","relateddim"=>0,"min"=>"0","max"=>"10")))),
 		);
 		//init constants, aliases and functions for test
@@ -143,8 +145,8 @@ class IHMExpressionParserClass
 		//echo "Source expression : ".$expression.PHP_EOL;
 		//clean expression and replace constants and aliases by associated value
 		$this->clean($expression);
-		$this->replaceConstants($expression);
-		$this->replaceAliases($expression);
+		$this->replaceConstants($expression);		
+		$this->replaceAliases($expression);		
 		$this->clean($expression);
 		//explode expression
@@ -274,13 +276,12 @@ class IHMExpressionParserClass
 			$this->aliasesArray = array();
 			$aliases_ = $dom->getElementsByTagName(self::$aliasNode);
-			for ($i = 1; $i <  $aliases_->length; $i++)
-				$this->aliasesArray[self::$alias_tag.$aliases_->item($i)->getAttribute(self::$aliasNameAtt)] = $aliases_->item($i)->nodeValue;
+			for ($i = 0; $i <  $aliases_->length; $i++)
+				$this->aliasesArray[self::$aliasTag.$aliases_->item($i)->getAttribute(self::$aliasNameAtt)] = $aliases_->item($i)->getAttribute('xml:id');
 		}
 		//replace
 		$expression = strtr($expression, $this->aliasesArray);
-
 		//be sure that all aliases are replaced
 		if ($this->isAliasDetected($expression))
 			throw new Exception('Cannot replace some aliases : '.$expression);
@@ -344,11 +345,11 @@ class IHMExpressionParserClass
 	}
 	/*
-	 * @brief detect if the element is "range"
+	 * @brief detect if the element is "range" or "indexes"
 	 */
-	private function isRange($element)
+	private function isRangeOrIndexes($element)
 	{
-		return ($element == "range");
+		return (($element == "range") || ($element == "indexes"));
 	}
 	/*
@@ -583,7 +584,7 @@ class IHMExpressionParserClass
 				!$this->isDecimal($element) &&
 				!$this->isOperator($element) &&
 				!$this->isFunction($element) &&
-				!$this->isRange($element) &&
+				!$this->isRangeOrIndexes($element) &&
 				($element != ",") && ($element != ";") && ($element != "("));
 	}
@@ -605,16 +606,20 @@ class IHMExpressionParserClass
 	/*
 	 * @brief detect if the element is a range for a parameter
 	*/
-	private function isParameterRange($tree, $i)
+	private function isParameterRangeOrIndexes($tree, $i, &$isIndexes)
 	{
 		$paramId = "";
+		$isIndexes = FALSE;
 		if ($i <= 0)
 			return false;
 		if (!$this->isParameter($tree[$i-1]))
 			return false;
-		return (is_array($tree[$i]) &&
+		$result = (is_array($tree[$i]) &&
 				(count($tree[$i] == 1)) &&
-				$this->isRange($tree[$i][0]));
+				$this->isRangeOrIndexes($tree[$i][0]));
+		if ($result)
+			$isIndexes = ($tree[$i][0] == "indexes");
+		return $result;
 	}
 	/*
@@ -633,23 +638,25 @@ class IHMExpressionParserClass
 	*/
 	private function addParameterComponentInParameterArray($paramId, $component, &$params)
 	{
-		foreach ($params as &$param)
-		if ($param["id"] == $paramId)
-		{
-			array_push($param["indexes"],$component);
-			return;
+		foreach ($params as &$param) {
+			if ($param["id"] == $paramId)
+			{
+				array_push($param["indexes"],$component);
+				return;
+			}
 		}
 	}
 	/*
 	 * @brief add a parameter range
 	*/
-	private function addParameterRangeInParameterArray($paramId, $range, &$params)
+	private function addParameterRangeOrIndexesInParameterArray($paramId, $range, $isIndexes, &$params)
 	{
 		$sum_parameter_id = "";
 		if ((count($range) == 2) && (count($range[1]) == 3) && ($this->isInteger($range[1][0])) && ($this->isInteger($range[1][2])) & ($range[1][1] == ",")) {
-			$sum_parameter_id = "sum_into_table_range_".$paramId."_0_".$range[1][0]."_".$range[1][2];
-			$params[] = array("id"      => "sum_into_table_range",
+			$sum_param = $isIndexes ? "sum_into_table_indexes" : "sum_into_table_range";
+			$sum_parameter_id = $sum_param."_".$paramId."_0_".$range[1][0]."_".$range[1][2];
+			$params[] = array("id"      => $sum_param,
 					          "fullparamid"  => $sum_parameter_id,
 							  "indexes" => array(),
 							  "calib_infos" => array(),
@@ -683,9 +690,10 @@ class IHMExpressionParserClass
 				if ($i < count($tree) - 1)
 				{
-					if ($this->isParameterRange($tree,$i+1))
+					$isIndexes = FALSE;
+					if ($this->isParameterRangeOrIndexes($tree,$i+1,$isIndexes))
 					{
-						$sum_parameter_id = $this->addParameterRangeInParameterArray($param, $tree[$i+1], $params);
+						$sum_parameter_id = $this->addParameterRangeOrIndexesInParameterArray($param, $tree[$i+1], $isIndexes, $params);
 						$param = $sum_parameter_id;
 						++$i;
 					}
@@ -694,8 +702,16 @@ class IHMExpressionParserClass
 						$this->addParameterIdInParameterArray($param,$params);
 						if ($this->isParameterComponent($tree,$i+1))
 						{
-							$this->addParameterComponentInParameterArray($param, $tree[$i+1][0], $params);
-							$param .= ("[".$tree[$i+1][0]."]");
+							if ((count($tree[$i+1]) == 3) && ($tree[$i+1][1] == ',') && $this->isInteger($tree[$i+1][2])) {
+								//2D
+								$this->addParameterComponentInParameterArray($param, array($tree[$i+1][0], $tree[$i+1][2]), $params);
+								$param .= ("[".$tree[$i+1][0]."][".$tree[$i+1][2]."]");
+							}
+							else {
+								//1D
+								$this->addParameterComponentInParameterArray($param, $tree[$i+1][0], $params);
+								$param .= ("[".$tree[$i+1][0]."]");
+							}
 							++$i;
 						}
 					}
@@ -835,7 +851,7 @@ class IHMExpressionParserClass
 		for ($i = 0; $i < count($tree); ++$i)
 		{
-			//echo "=> ".$tree[$i].PHP_EOL;
+			#echo "=> ".$tree[$i].PHP_EOL;
 			if (is_array($tree[$i]))
 			{
 				//echo "ARRAY".PHP_EOL;
@@ -879,7 +895,7 @@ class IHMExpressionParserClass
 				$founded = false;
 				foreach ($params as $param)
 				{
-					//echo "TEST ".$param["id"].PHP_EOL;
+					#echo "TEST ".$param["id"].PHP_EOL;
 					if (array_key_exists("template_args", $param))
 					{
@@ -897,8 +913,15 @@ class IHMExpressionParserClass
 					foreach ($param["indexes"] as $index)
 					{
 						$temp = "";
-						$temp .= ($param["id"]."[".$index."]");
-						//echo "TEST 2 ".$temp.PHP_EOL;
+						if (is_array($index) && (count($index) == 2)) {
+							//2D
+							$temp .= ($param["id"]."[".$index[0]."][".$index[1]."]");
+						}
+						else {
+							//1D
+							$temp .= ($param["id"]."[".$index."]");
+						}
+						#echo "TEST 2 ".$temp.PHP_EOL;
 						if ($temp == $tree[$i])
 						{
 							$founded = true;
@@ -906,6 +929,7 @@ class IHMExpressionParserClass
 							break;
 						}
 					}
+
 					if ($founded)
 						break;
 				}
@@ -11,6 +11,7 @@ class IHMParamManagerClass
 	protected $expressionParser = null;
 	protected $templateParamsManager = null;
 	protected $paramImpexMgr     = null;
+	protected $ttCatMgr = null;
 	/*
 	 * @brief Constructor
@@ -68,6 +69,79 @@ class IHMParamManagerClass
 	}
 	/*
+	 *  @brief Add a TT or catalog parameter
+	 */
+	public function addTTCatParam($paramId, $paramsData)
+	{
+		if (!isset($this->ttCatMgr)) {
+			$this->ttCatMgr = new IHMTTCatLoaderClass();
+		}
+		$info = $this->ttCatMgr->getTTCatInfoFromId($paramId);
+
+		if (!$info["success"]) {
+			throw new Exception($info["message"]);
+		}
+
+		$status = array();
+		$units = "";
+		$ytitle = "";
+		$flag = "";
+
+		if ($info["info"]["isCatalog"]) {
+			$parameters = $this->ttCatMgr->getCatalogParameters($paramId);
+			if (!$parameters["success"] || empty($parameters["parameters"])) {
+				throw new Exception("Error to extract first parameter of ".$paramId);
+			}
+			//For the moment, use the first parameter
+			$parameter = $parameters["parameters"][0];
+			$units     = $parameter["units"];
+			$ytitle    = !empty($parameter["name"]) ? $parameter["name"] : $parameter["id"];
+			$flag      = $parameter["id"];
+			$description = $parameter["description"];
+			$desc_parts = array();
+			foreach (explode("-",$description) as $def) {
+				$def = trim($def);
+				$p = strpos($def, ":");
+				if ($p === FALSE) {
+					continue;
+				}
+				$val = substr($def, 0, $p);
+				$val = trim($val);
+				$name = substr($def, $p+1);
+				$name = trim($name);
+				$color = "";
+				$p = strpos($name, "[");
+				if ($p !== FALSE) {
+					$color = substr($name, $p);
+					$color = trim($color);
+					$name = substr($name, 0, $p);
+					$name = trim($name);
+				}
+				$status[] = array(
+					"min" => floatval($val),
+					"max" => floatval($val),
+					"name" => $name,
+					"color" => $color,
+				);
+			}
+		}
+		else {
+			$status = array(
+				array(
+					"min" => 1,
+					"max" => 1,
+					"name" => "Inside",
+					"color" => "[255,0,0]",
+				)
+			);
+			$ytitle = $info["info"]["name"];
+		}
+
+		$paramsData->addTTCatParamToCreate($paramId, $info["info"]["path"], $info["info"]["isShared"], filemtime($info["info"]["path"]), $units, $ytitle, $status, $flag);
+		return array("id" => $paramId, "indexes" => array(), "calib_infos" => array());
+	} 
+
+	/*
 	 * @brief Detect if it's a derived parameter
 	*/
 	private function isDerivedParam($param)
@@ -326,8 +400,10 @@ class IHMParamManagerClass
 		if (!$res["success"])
 			throw new Exception('Error to load uploaded parameter file : '.$res["message"]);
+
+		$paramId = $param;
-		$newParamNode = $paramsData->addLocalParamToCreate($res["param"]["id"], 
+		$newParamNode = $paramsData->addLocalParamToCreate($paramId, 
 				$res["param"]["info"]["viId"], $res["param"]["info"]["realVar"],
 				$res["param"]["info"]["minSampling"], $res["param"]["info"]["maxSampling"],
 				$res["param"]["info"]["type"],$res["param"]["info"]["size"],
@@ -439,19 +515,48 @@ class IHMParamManagerClass
 			}
 		}
-		return array("id" => $res["param"]["id"], "plotType" => $res["param"]["info"]["plotType"]);
+		return array("id" => $paramId, "plotType" => $res["param"]["info"]["plotType"]);
 	}
 	public function applyRangesAndIndexes($paramsData, $paramData, $force_total_2d, &$paramInfo) {
-		$dim1_is_range = (isset($paramData->{'dim1-is-range'}) && $paramData->{'dim1-is-range'});
+		$dim1_min = 0;
+		$dim1_max = 0;
+		$dim2_min = 0;
+		$dim2_max = 0;
+
+		$dim1_is_range = (isset($paramData->{'dim1-sum-type'}) && ($paramData->{'dim1-sum-type'} > 0));
 		$dim1_index = ($dim1_is_range || !isset($paramData->{'dim1-index'}) || ($paramData->{'dim1-index'} == '')) ? '*' : $paramData->{'dim1-index'};
-		$dim1_min = (!$dim1_is_range || !isset($paramData->{'dim1-min-range'}) || ($paramData->{'dim1-min-range'} == '')) ? 0 : $paramData->{'dim1-min-range'};
-		$dim1_max = (!$dim1_is_range || !isset($paramData->{'dim1-max-range'}) || ($paramData->{'dim1-max-range'} == '')) ? 0 : $paramData->{'dim1-max-range'};
+		if ($dim1_is_range) {
+			switch ($paramData->{'dim1-sum-type'}) {
+				case 1:
+					//Sum between a range of value
+					$dim1_min = !empty($paramData->{'dim1-min-value'}) ? $paramData->{'dim1-min-value'} : 0;
+					$dim1_max = !empty($paramData->{'dim1-max-value'}) ? $paramData->{'dim1-max-value'} : 0;
+					break;
+				case 2:
+					//Sum between indexes
+					$dim1_min = !empty($paramData->{'dim1-min-index'}) ? $paramData->{'dim1-min-index'} : 0;
+					$dim1_max = !empty($paramData->{'dim1-max-index'}) ? $paramData->{'dim1-max-index'} : 0;
+					break;
+			}
+		}
-		$dim2_is_range = (isset($paramData->{'dim2-is-range'}) && $paramData->{'dim2-is-range'});
+		$dim2_is_range = (isset($paramData->{'dim2-sum-type'}) && ($paramData->{'dim2-sum-type'} > 0));
 		$dim2_index = ($dim2_is_range || !isset($paramData->{'dim2-index'}) || ($paramData->{'dim2-index'} == '')) ? '*' : $paramData->{'dim2-index'};
-		$dim2_min = (!$dim2_is_range || !isset($paramData->{'dim2-min-range'}) || ($paramData->{'dim2-min-range'} == '')) ? 0 : $paramData->{'dim2-min-range'};
-		$dim2_max = (!$dim2_is_range || !isset($paramData->{'dim2-max-range'}) || ($paramData->{'dim2-max-range'} == '')) ? 0 : $paramData->{'dim2-max-range'};
+		if ($dim2_is_range) {
+			switch ($paramData->{'dim2-sum-type'}) {
+				case 1:
+					//Sum between a range of value
+					$dim2_min = !empty($paramData->{'dim2-min-value'}) ? $paramData->{'dim2-min-value'} : 0;
+					$dim2_max = !empty($paramData->{'dim2-max-value'}) ? $paramData->{'dim2-max-value'} : 0;
+					break;
+				case 2:
+					//Sum between indexes
+					$dim2_min = !empty($paramData->{'dim2-min-index'}) ? $paramData->{'dim2-min-index'} : 0;
+					$dim2_max = !empty($paramData->{'dim2-max-index'}) ? $paramData->{'dim2-max-index'} : 0;
+					break;
+			}
+		}
 		switch ($paramData->{'type'}) {
 			case 0:
@@ -466,7 +571,10 @@ class IHMParamManagerClass
 						'max' => $dim1_max,
 						'relateddim' => 0,
 					);
-					$paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args);
+					if ($paramData->{'dim1-sum-type'} == 2)
+						$paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args);
+					else
+						$paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args);
 				}
 				else if ($dim2_is_range) {
 					$template_args = array(
@@ -475,7 +583,10 @@ class IHMParamManagerClass
 						'max' => $dim2_max,
 						'relateddim' => 1,
 					);
-					$paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args);
+					if ($paramData->{'dim2-sum-type'} == 2)
+						$paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args);
+					else
+						$paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args);
 				}
 				else if ($dim1_index != '*') {
 					$paramInfo['indexes'][] = $dim1_index;
@@ -487,6 +598,9 @@ class IHMParamManagerClass
 			case 2:
 				//Tab2D
 				if ($dim1_is_range && $dim2_is_range) {
+					if ($paramData->{'dim1-sum-type'} != $paramData->{'dim2-sum-type'}) {
+						throw new Exception("Not supported - Dimensions ranges for ".$paramInfo['id']." must have the same type for each dimensions");
+					}
 					$template_args = array(
 						'paramid' => $paramInfo['id'],
 						'min1' => $dim1_min,
@@ -495,7 +609,10 @@ class IHMParamManagerClass
 						'min2' => $dim2_min,
 						'max2' => $dim2_max,
 					);
-					$paramInfo = $this->addExistingParam('sum_into_table_range_2d', $paramsData, $template_args);
+					if ($paramData->{'dim1-sum-type'} == 2)
+						$paramInfo = $this->addExistingParam('sum_into_table_indexes_2d', $paramsData, $template_args);
+					else
+						$paramInfo = $this->addExistingParam('sum_into_table_range_2d', $paramsData, $template_args);
 				}
 				else if ($dim1_is_range) {
 					$template_args = array(
@@ -508,7 +625,10 @@ class IHMParamManagerClass
 						'paramid' => $paramInfo['id'],
 						'relateddim' => 1,
 					);
-					$paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args, $tableLink);
+					if ($paramData->{'dim1-sum-type'} == 2)
+						$paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args, $tableLink);
+					else
+						$paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args, $tableLink);
 					if ($dim2_index != '*') {
 						$paramInfo['indexes'][] = $dim2_index;
 					}
@@ -524,7 +644,10 @@ class IHMParamManagerClass
 						'paramid' => $paramInfo['id'],
 						'relateddim' => 0,
 					);
-					$paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args, $tableLink);
+					if ($paramData->{'dim2-sum-type'} == 2)
+						$paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args, $tableLink);
+					else
+						$paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args, $tableLink);
 					if ($dim1_index != '*') {
 						$paramInfo['indexes'][] = $dim1_index;
 					}
@@ -0,0 +1,235 @@
+<?php
+
+/**
+ * @class IHMTTCatLoaderClass
+ * @brief Loader for IHM TimeTables and Catalogs properties
+ * @details
+ */
+class IHMTTCatLoaderClass
+{
+	protected $ttCatList = null;
+
+	private static $userTTCatFile               = 'Tt.xml';
+	
+	private static $mgrUserTTListNode           = 'timetabList';
+	private static $mgrUserTTEltNode            = 'timetab';
+
+	private static $mgrUserCatListNode          = 'catalogList';
+	private static $mgrUserCatEltNode           = 'catalog';
+
+	private static $mgrUserTTCatEltIdAtt        = 'xml:id';
+	private static $mgrUserTTCatEltNameAtt      = 'name';
+	private static $mgrUserTTCatEltNbIntAtt     = 'intervals';
+
+	private static $mgrUserTTCatFolderNode      = 'folder';
+	private static $mgrUserTTCatFolderIdAtt     = 'xml:id';
+	private static $mgrUserTTCatFolderNameAtt   = 'name';
+
+	private static $mgrSharedTTListNode         = 'timeTableList';
+	private static $mgrSharedTTEltNode          = 'timeTable';
+
+	private static $mgrSharedCatListNode        = 'catalogList';
+	private static $mgrSharedCatEltNode         = 'catalog';
+
+	private static $mgrSharedTTCatEltIdAtt      = 'xml:id';
+	private static $mgrSharedTTCatEltNameAtt    = 'name';
+	private static $mgrSharedTTCatEltNbIntAtt   = 'nbIntervals';
+
+	private static $mgrSharedTTCatFolderNode    = 'folder';
+	private static $mgrSharedTTCatFolderIdAtt   = 'xml:id';
+	private static $mgrSharedTTCatFolderNameAtt = 'name';
+
+	/*
+	 * @brief Constructor
+	*/
+	function __construct()
+	{
+	}
+	
+	/*
+	 * @brief Get info about a TT or a catalog from id
+	 */
+	public function getTTCatInfoFromId($id)
+	{
+		if (!isset($this->ttCatList)) {
+			$this->ttCatList = $this->loadTTCatManagerFiles();
+		}
+		if (!array_key_exists($id, $this->ttCatList)) {
+			return array("success" => false, "message" => "Cannot retrieve TT or catalog");
+		}
+		return array("success" => true, "info" => $this->ttCatList[$id]);
+	}
+
+	/*
+	 * @brief Get parameters from id (empty for a TT)
+	 */
+	public function getCatalogParameters($id)
+	{
+		$info = $this->getTTCatInfoFromId($id);
+		if (!$info["success"]) {
+			return $info;
+		}
+
+		if (!$info["info"]["isCatalog"]) {
+			return array("success" => TRUE, "parameters" => array());
+		}
+
+		$dom = new DomDocument("1.0");
+                if (!$dom->load($info["info"]["path"])) {
+			return array("success" => FALSE, "message" => "Cannot open catalog ".$id);
+		}
+
+		$parametersNodes = $dom->getElementsByTagName("parameters");
+		if ($parametersNodes->length == 0) {
+			return array("success" => FALSE, "message" => "Cannot retrieve parameters node in catalog ".$id);
+		}
+
+		$parametersNode = $parametersNodes->item(0);
+
+		$parameterNodes = $parametersNode->getElementsByTagName("parameter");
+
+		$parameters = array();
+		foreach ($parameterNodes as $parameterNode) {
+			$parameters[] = array(
+				"id" => $parameterNode->getAttribute("id"),
+				"name" => $parameterNode->getAttribute("name"),
+				"size" => $parameterNode->getAttribute("size"),
+				"type" => $parameterNode->getAttribute("type"),
+				"unit" => $parameterNode->getAttribute("unit"),
+				"description" => $parameterNode->getAttribute("description"),
+				"ucd" => $parameterNode->getAttribute("ucd"),
+				"utype" => $parameterNode->getAttribute("utype"),
+			);
+		}
+
+		return array("success" => TRUE, "parameters" => $parameters);
+	}
+	
+
+	/*
+	 * @brief Load all TT and catalogs from manager files
+	 */
+	private function loadTTCatManagerFiles()
+	{
+		if (isset($this->ttCatList)) {
+			return $this->ttCatList;
+		}
+
+		return $this->loadUserTTCatManagerFile() + $this->loadSharedTTCatManagerFile();
+	}
+
+	/*
+	 * @brief Load user TT and cat manager file
+	 */
+	private function loadUserTTCatManagerFile()
+	{
+		//load xml file
+		$dom = new DomDocument("1.0");
+		if (!$dom->load(IHMConfigClass::getUserWSPath() . '/' . self::$userTTCatFile))
+			return array();
+
+		$ttCat = array();
+
+		//get TT
+		$listNodes = $dom->getElementsByTagName(self::$mgrUserTTListNode);
+		if ($listNodes->length > 0) {
+			$this->getEltRecursively($listNodes->item(0), FALSE, FALSE, array(), $ttCat);
+		}
+
+		//get catalogs
+		$listNodes = $dom->getElementsByTagName(self::$mgrUserCatListNode);
+		if ($listNodes->length > 0) {
+			$this->getEltRecursively($listNodes->item(0), FALSE, TRUE, array(), $ttCat);
+		}
+
+		return $ttCat;
+	}
+	
+	/*
+	 * @brief Load shared objects manager file
+	 */
+	private function loadSharedTTCatManagerFile()
+	{
+		//load xml file
+		$dom = new DomDocument("1.0");
+		if (!$dom->load(IHMConfigClass::getSharedTreeFilePath()))
+			return array();
+
+		$ttCat = array();
+
+		//get TT
+		$listNodes = $dom->getElementsByTagName(self::$mgrSharedTTListNode);
+		if ($listNodes->length > 0) {
+			$this->getEltRecursively($listNodes->item(0), TRUE, FALSE, array(), $ttCat);
+		}
+
+		//get catalogs
+		$listNodes = $dom->getElementsByTagName(self::$mgrSharedCatListNode);
+		if ($listNodes->length > 0) {
+			$this->getEltRecursively($listNodes->item(0), TRUE, TRUE, array(), $ttCat);
+		}
+
+		return $ttCat;
+	}
+
+	private function getEltRecursively($baseNode, $isShared, $isCatalog, $folders, &$elts) {
+		if ($isShared) {
+			$basePath = IHMConfigClass::getSharedPath();
+			if ($isCatalog) {
+				$eltNode = self::$mgrSharedCatEltNode;
+				$basePath .= "/CAT";
+			}
+			else {
+				$eltNode = self::$mgrSharedTTEltNode;
+				$basePath .= "/TT";
+			}
+			$eltIdAtt      = self::$mgrSharedTTCatEltIdAtt;
+			$eltNameAtt    = self::$mgrSharedTTCatEltNameAtt;
+			$eltNbIntAtt   = self::$mgrSharedTTCatEltNbIntAtt;
+			$folderNode    = self::$mgrSharedTTCatFolderNode;
+			$folderIdAtt   = self::$mgrSharedTTCatFolderIdAtt;
+			$folderNameAtt = self::$mgrSharedTTCatFolderNameAtt;
+			if (!empty($folders)) {
+				$basePath .= "/".$folders[0]["name"]."/data";
+			}
+		}
+		else {
+			$basePath = IHMConfigClass::getUserTTPath();
+			if ($isCatalog) {
+				$eltNode = self::$mgrUserCatEltNode;
+			}
+			else {
+				$eltNode = self::$mgrUserTTEltNode;
+			}
+			$eltIdAtt      = self::$mgrUserTTCatEltIdAtt;
+			$eltNameAtt    = self::$mgrUserTTCatEltNameAtt;
+			$eltNbIntAtt   = self::$mgrUserTTCatEltNbIntAtt;
+			$folderNode    = self::$mgrUserTTCatFolderNode;
+			$folderIdAtt   = self::$mgrUserTTCatFolderIdAtt;
+			$folderNameAtt = self::$mgrUserTTCatFolderNameAtt;
+		}
+
+		$eltNodes = $baseNode->getElementsByTagName($eltNode);
+		foreach ($eltNodes as $node) {
+			$elts[$node->getAttribute($eltIdAtt)] = array(
+				"id" => $node->getAttribute($eltIdAtt),
+				"name" => $node->getAttribute($eltNameAtt),
+				"nbIntervals" => $node->getAttribute($eltNbIntAtt),
+				"folders" => $folders,
+				"path" => $basePath . "/" . $node->getAttribute($eltIdAtt). ".xml",
+				"isShared" => $isShared,
+				"isCatalog" => $isCatalog,
+			);
+		}
+
+		$folderNodes = $baseNode->getElementsByTagName($folderNode);
+		foreach ($folderNodes as $node) {
+			$crt_folders = $folders;
+			$crt_folders[] = array(
+				"id" => $node->getAttribute($folderIdAtt),
+				"name" => $node->getAttribute($folderNameAtt),
+			);
+			$this->getEltRecursively($node, $isShared, $isCatalog, $crt_folders, $elts);
+		}
+	}
+}
@@ -31,13 +31,13 @@ class WSInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClass
 		$outputsNode = $requestNode->getOutputsNode();
 		$downloadNode = $outputsNode->addNewOutput(RequestOutputTypeEnum::DOWNLOAD);
-		switch ($input->timeformat)
+		switch (strtoupper($input->timeformat))
 		{
 			case 'ISO08601' :
 				$downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::ISO);
 				break;
-			case 'unixtime' :
-				$downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::TIMESTAMP);
+			case 'UNIXTIME' :
+				$downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::MS);
 				break;
 			default :
 				$downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::ISO);
@@ -16,7 +16,7 @@ class WSJobsManagerClass extends IHMJobsManagerClass {
 	protected $resRootNode = array(WSConfigClass::PLOT => 'resPlotRootNode',
 			WSConfigClass::PARAMETER => 'resParamRootNode',
 			WSConfigClass::ORBIT => 'resOrbRootNode',
-			WSConfigClass::DATASET => 'bkgDatasetRootNode');
+			WSConfigClass::DATASET => 'resDatasetRootNode');
 	/*
 	 * @brief Constructor
@@ -36,15 +36,18 @@ class WSJobsManagerClass extends IHMJobsManagerClass {
 		if (!file_exists($this->jobXmlName))
 		{
 			$res = $this->createJobsFile();
-			if (!$res['success'])
+			if (!$res['success']) {
+				error_log("WebServices Error : Cannot create WSjobs.xml", 1, email);
 				return $res;
+			}
 		}
-
 		$res = $this->jobXml->load($this->jobXmlName);
-		if (!$res)
+		if (!$res) {
+			error_log("WebServices Error : Cannot load WSjobs.xml", 1, email);
 			return array(
 					"success" => false,
 					"message" => "Cannot load jobs file");
+			}
 		return array("success" => true);
 	}
@@ -265,14 +268,6 @@ class WSJobsManagerClass extends IHMJobsManagerClass {
 		}
 		$this->deleteRequestObjectFile($id);
-
-// 		$job->parentNode->removeChild($job);
-// 		$res = $this->jobXml->save($this->jobXmlName);
-
-		if (!$res)
-			return array(
-					'success' => false,
-					'message' => "Cannot save jobs file");
 		return array('success' => true, 'id' => $id);
 	}
@@ -16,7 +16,12 @@ define (&quot;INFOPARAM_SICONV&quot;, &quot;si_conversion&quot;);
 define ("INFOPARAM_TABLE", "table");
 define ("INFOPARAM_FILLVAL", "fill_value");
 define ("INFOPARAM_UCD", "ucd");
-//define ("INFOPARAM_STATUSDEF", "status_def");
+define ("INFOPARAM_STATUSDEF", "status_def");
+define ("INFOPARAM_STATUS", "status");
+define ("INFOPARAM_STATUS_MINVAL", "minVal");
+define ("INFOPARAM_STATUS_MAXVAL", "maxVal");
+define ("INFOPARAM_STATUS_NAME", "name");
+define ("INFOPARAM_STATUS_COLOR", "color");
 define ("INFOPARAM_DATASETID", "dataset_id");
 /**
@@ -51,7 +56,7 @@ class InfoParamNodeClass extends NodeClass
 		$this->getChildInstanceByName(INFOPARAM_TABLE,true);
 		$this->getChildInstanceByName(INFOPARAM_FILLVAL,true);
 		$this->getChildInstanceByName(INFOPARAM_UCD,true);
-		//$this->getChildInstanceByName(INFOPARAM_STATUSDEF,true);
+		$this->getChildInstanceByName(INFOPARAM_STATUSDEF,true);
 		$this->getChildInstanceByName(INFOPARAM_DATASETID,true);
 	}
@@ -148,6 +153,28 @@ class InfoParamNodeClass extends NodeClass
 	{
 		return $this->getChildInstanceByName(INFOPARAM_TABLE, true);
 	}
+
+	public function getStatusDef()
+	{
+		return $this->getChildInstanceByName(INFOPARAM_STATUSDEF, true);
+	}
+
+	public function addStatus($min, $max, $name, $color = "")
+	{
+		$node = $this->getStatusDef();
+
+		$statusNode = new NodeClass(INFOPARAM_STATUS);
+		$statusNode->setAttribute(INFOPARAM_STATUS_MINVAL, $min);
+		$statusNode->setAttribute(INFOPARAM_STATUS_MAXVAL, $max);
+		$statusNode->setAttribute(INFOPARAM_STATUS_NAME, $name);
+		if (!empty($color)) {
+			$statusNode->setAttribute(INFOPARAM_STATUS_COLOR, $color);
+		}
+
+		$node->addChild($statusNode);
+
+		return $statusNode;
+	}
 	public function loadFromNode($xmlNode)
 	{
@@ -208,6 +235,17 @@ class InfoParamNodeClass extends NodeClass
 		$ucdXmlNode = $this->getXmlNodeChildByTagName($xmlNode, INFOPARAM_UCD);
 		if (isset($ucdXmlNode))
 			$this->setUCD($this->getXmlNodeValue($ucdXmlNode));
+
+		$statusDefXmlNode = $this->getXmlNodeChildByTagName($xmlNode, INFOPARAM_STATUSDEF);
+		if (isset($statusDefXmlNode)) {
+			foreach ($this->getXmlNodeChildren($statusDefXmlNode) as $statusNode) {
+				$minVal = $this->getXmlNodeAttribute($statusNode, INFOPARAM_STATUS_MINVAL);
+				$maxVal = $this->getXmlNodeAttribute($statusNode, INFOPARAM_STATUS_MAXVAL);
+				$name = $this->getXmlNodeAttribute($statusNode, INFOPARAM_STATUS_NAME);
+				$color = $this->getXmlNodeAttribute($statusNode, INFOPARAM_STATUS_COLOR);
+				$this->addStatus($minVal, $maxVal, $name, $color);
+			}
+		}
 		$datasetidXmlNode = $this->getXmlNodeChildByTagName($xmlNode, INFOPARAM_DATASETID);
 		if (isset($datasetidXmlNode))
@@ -0,0 +1,53 @@
+<?php
+
+require_once "ParamGetConstantParamNodeClass.php";
+
+define ("PARAMGETCONSTANT_VI", "constant");
+
+/**
+ * @class ParamGetConstantNodeClass
+ * @brief Definition of a constant getter for AMDA_Kernel
+ * @details
+*/
+class ParamGetConstantNodeClass extends NodeClass
+{
+	public function __construct()
+	{
+		parent::__construct(PARAMGETCONSTANT_VI);
+	}
+
+	public function getConstant($sampling = "60", $type = "int", $dim1 = "1", $dim2 = "1", $value = "1")
+	{
+		$nodes = $this->getChildrenByName(PARAMGETCONSTANTPARAM_NAME);
+	
+		foreach ($nodes as $node)
+			if (($node->getSampling() == $sampling) && ($node->getType() == $type) && ($node->getConstValue() == $value) &&
+				($node->getDim1() == $dim1) && ($node->getDim2() == $dim2))
+			return $node;
+		return NULL;
+	}
+	
+	public function addConstant($sampling = "60", $type = "int", $dim1 = "1", $dim2 = "1", $value = "1")
+	{
+		$constantNode = new ParamGetConstantParamNodeClass();
+		
+		$constantNode->setSampling($sampling);
+		$constantNode->setType($type);
+		$constantNode->setDim1($dim1);
+		$constantNode->setDim2($dim2);
+		$constantNode->setConstValue($value);
+
+		$this->addChild($constantNode);
+		
+		return $constantNode;
+	}
+	
+	public function loadFromNode($xmlNode)
+	{
+		foreach ($this->getXmlNodeChildrenByTagName($xmlNode, PARAMGETCONSTANTPARAM_NAME) as $constantXmlNode) {
+			$this->addConstant()->loadFromNode($constantXmlNode);
+		}
+	}
+}
+
+?>
@@ -0,0 +1,86 @@
+<?php
+
+define ("PARAMGETCONSTANTPARAM_NAME", "param");
+define ("PARAMGETCONSTANTPARAM_SAMPLING", "sampling");
+define ("PARAMGETCONSTANTPARAM_TYPE", "type");
+define ("PARAMGETCONSTANTPARAM_VALUE", "value");
+define ("PARAMGETCONSTANTPARAM_DIM1", "dim1");
+define ("PARAMGETCONSTANTPARAM_DIM2", "dim2");
+
+/**
+ * @class ParamGetConstantParamNodeClass
+ * @brief Definition of a constant parameter
+ * @details
+*/
+class ParamGetConstantParamNodeClass extends NodeClass
+{
+	public function __construct()
+	{
+		parent::__construct(PARAMGETCONSTANTPARAM_NAME);
+	}
+
+	public function getSampling()
+	{
+		return $this->getAttribute(PARAMGETCONSTANTPARAM_SAMPLING);
+	}
+
+	public function setSampling($sampling)
+	{
+		$this->setAttribute(PARAMGETCONSTANTPARAM_SAMPLING, $sampling);
+	}
+
+	public function getType()
+	{
+		return $this->getAttribute(PARAMGETCONSTANTPARAM_TYPE);
+	}
+
+	public function setType($type)
+	{	
+		$this->setAttribute(PARAMGETCONSTANTPARAM_TYPE, strtolower($type));
+	}
+
+	public function getConstValue()
+	{
+		return $this->getAttribute(PARAMGETCONSTANTPARAM_VALUE);
+	}
+
+	public function setConstValue($value)
+	{
+		$this->setAttribute(PARAMGETCONSTANTPARAM_VALUE, $value);
+	}
+
+	public function getDim1()
+	{
+		return $this->getAttribute(PARAMGETCONSTANTPARAM_DIM1);
+	}
+
+	public function setDim1($dim1)
+	{
+		$this->setAttribute(PARAMGETCONSTANTPARAM_DIM1, $dim1);
+	}
+
+	public function getDim2()
+	{
+		return $this->getAttribute(PARAMGETCONSTANTPARAM_DIM2);
+	}
+
+	public function setDim2($dim2)
+	{
+		$this->setAttribute(PARAMGETCONSTANTPARAM_DIM2, $dim2);
+	}
+	
+	public function loadFromNode($xmlNode)
+	{
+		$this->setSampling($this->getXmlNodeAttribute($xmlNode, PARAMGETCONSTANTPARAM_SAMPLING));
+
+		$this->setType($this->getXmlNodeAttribute($xmlNode, PARAMGETCONSTANTPARAM_TYPE));
+
+		$this->setConstValue($this->getXmlNodeAttribute($xmlNode, PARAMGETCONSTANTPARAM_VALUE));
+
+		$this->setDim1($this->getXmlNodeAttribute($xmlNode, PARAMGETCONSTANTPARAM_DIM1));
+
+		$this->setDim2($this->getXmlNodeAttribute($xmlNode, PARAMGETCONSTANTPARAM_DIM2));
+	}
+}
+
+?>
@@ -4,6 +4,7 @@ require_once &quot;ParamClbManualNodeClass.php&quot;;
 require_once "ParamGetAmdaParamNodeClass.php";
 require_once "ParamGetDDBaseNodeClass.php";
 require_once "ParamGetLocalBaseNodeClass.php";
+require_once "ParamGetConstantNodeClass.php";
 require_once dirname(__FILE__)."/../Infos/InfoParamNodeClass.php";
 require_once dirname(__FILE__)."/../Requests/RequestOutputPlotPanelNodeClass.php";
@@ -22,6 +23,7 @@ abstract class ParamGetTypeEnum
 	const AMDAPARAM   = "AmdaParam";
 	const DDBASE      = "DDBase";
 	const LOCALBASE   = "LocalBase";
+	const CONSTANT    = "Constant";
 }
 /**
@@ -89,6 +91,9 @@ class ParamNodeClass extends NodeClass
 			case ParamGetTypeEnum::LOCALBASE :
 				$paramGet = new ParamGetLocalBaseNodeClass();
 				break;
+			case ParamGetTypeEnum::CONSTANT :
+				$paramGet = new ParamGetConstantNodeClass();
+				break;
 			default :
 				throw new Exception('Param get node not implemented');
 		}
@@ -164,6 +169,9 @@ class ParamNodeClass extends NodeClass
 					case PARAMGETLOCALBASE_VI :
 						$this->addParamGet(ParamGetTypeEnum::LOCALBASE)->loadFromNode($paramGetDefXmlNode);
 						break;
+					case PARAMGETCONSTANT_VI :
+						$this->addParamGet(ParamGetTypeEnum::CONSTANT)->loadFromNode($paramGetDefXmlNode);
+						break;
 				}
 			}
 		}
@@ -26,6 +26,7 @@ define (&quot;REQUESTOUTPUTPLOTSPECTRO_INDEX&quot;, &quot;index&quot;);
 define ("REQUESTOUTPUTPLOTSPECTRO_MIN", "min");
 define ("REQUESTOUTPUTPLOTSPECTRO_MAX", "max");
 define ("REQUESTOUTPUTPLOTSPECTRO_USELOG0ASMIN", "uselog0asmin");
+define ("REQUESTOUTPUTPLOTSPECTRO_RESOLUTION", "resolution");
 define ("REQUESTOUTPUTPLOTINSTANTSPECTRO_NAME", "ispectro");
 define ("REQUESTOUTPUTPLOTINSTANTSPECTRO_XAXIS", "xAxis");
@@ -37,6 +38,8 @@ define (&quot;REQUESTOUTPUTPLOTSTATUSBAR_INDEX&quot;, &quot;index&quot;);
 define ("REQUESTOUTPUTPLOTTICKBAR_NAME", "serie");
 define ("REQUESTOUTPUTPLOTTICKBAR_INDEX", "index");
+define ("REQUESTOUTPUTPLOTINTERVALS_NAME", "intervals");
+
 /**
  * @class RequestOutputPlotParamNodeClass
  * @brief Definition of a param for a plot of a plot request
@@ -103,11 +106,13 @@ class RequestOutputPlotParamNodeClass extends NodeClass
 		return $iserieNode;
 	}
-	public function addSpectro($yAxis = "", $index = NULL, $min = NULL, $max = NULL, $uselog0asmin = FALSE)
+	public function addSpectro($yAxis = "", $resolution="", $index = NULL, $min = NULL, $max = NULL, $uselog0asmin = FALSE)
 	{
 		$spectroNode = new NodeClass(REQUESTOUTPUTPLOTSPECTRO_NAME);
 		$spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_YAXIS, $yAxis);
 		$spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_USELOG0ASMIN, $uselog0asmin ? "true" : "false");
+		if (isset($resolution))
+			$spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_RESOLUTION, $resolution);
 		if (isset($index))
 			$spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_INDEX, $index);
 		if (isset($min))
@@ -174,6 +179,13 @@ class RequestOutputPlotParamNodeClass extends NodeClass
 		$this->addChild($tickBarNode);
 		return $tickBarNode;
 	}
+
+	public function addIntervals()
+	{
+		$intervalsNode = new NodeClass(REQUESTOUTPUTPLOTINTERVALS_NAME);
+		$this->addChild($intervalsNode);
+		return $intervalsNode;
+	}
 	public function loadFromNode($xmlNode)
 	{
@@ -199,8 +211,9 @@ class RequestOutputPlotParamNodeClass extends NodeClass
 					$index = $this->getXmlNodeAttribute($plottypeXmlNode, REQUESTOUTPUTPLOTSPECTRO_INDEX);
 					$min = $this->getXmlNodeAttribute($plottypeXmlNode, REQUESTOUTPUTPLOTSPECTRO_MIN);
 					$max = $this->getXmlNodeAttribute($plottypeXmlNode, REQUESTOUTPUTPLOTSPECTRO_MAX);
+					$resolution = $this->getXmlNodeAttribute($plottypeXmlNode, REQUESTOUTPUTPLOTSPECTRO_RESOLUTION);
 					$uselog0asmin = $this->getXmlNodeAttribute($plottypeXmlNode, REQUESTOUTPUTPLOTSPECTRO_USELOG0ASMIN) == "true";
-					$node = $this->addSpectro($yAxis, $index, $min, $max, $uselog0asmin);
+					$node = $this->addSpectro($yAxis, $resolution, $index, $min, $max, $uselog0asmin);
 					break;
 				case REQUESTOUTPUTPLOTXSERIE_NAME :
 					$xAxis = $this->getXmlNodeAttribute($plottypeXmlNode, REQUESTOUTPUTPLOTXSERIE_XAXIS);
@@ -8,6 +8,7 @@ define (&quot;REQUESTOUTPUTPLOTYSERIE_TIMEPLOT_NAME&quot;, &quot;serie&quot;);
 define ("REQUESTOUTPUTPLOTYSERIE_XID", "xId");
 define ("REQUESTOUTPUTPLOTYSERIE_INDEX", "index");
+define ("REQUESTOUTPUTPLOTYSERIE_RESOLUTION", "resolution");
 define ("REQUESTOUTPUTPLOTYSERIE_RESAMPLING", "resampling");
 define ("REQUESTOUTPUTPLOTYSERIE_ERRORBAR", "errorBar");
@@ -33,6 +34,16 @@ class RequestOutputPlotYSerieNodeClass extends RequestOutputPlotBaseSerieNodeCla
 		return $this->getAttribute(REQUESTOUTPUTPLOTYSERIE_INDEX);
 	}
+	public function setResolution($resolution)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTYSERIE_RESOLUTION, $resolution);
+	}
+
+	public function getResolution()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTYSERIE_RESOLUTION);
+	}
+
 	public function setXId($xId)
 	{
 		$this->setAttribute(REQUESTOUTPUTPLOTYSERIE_XID, $xId);
@@ -169,6 +169,39 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
 		$this->processParamsToCreate[$paramId] = array('param' => $newParam, 'dateModif' => $dateModif);
 	}
+
+	public function addTTCatParamToCreate($paramId, $ttCatFilePath, $isShared, $dateModif, $units, $ytitle, $status, $flag = "")
+	{
+		$newParam = new ParamNodeClass();
+		$newParam->setId($paramId);
+		if (!empty($units)) {
+			$newParam->getInfo()->setUnits($units);
+		}
+		if (!empty($ytitle)) {
+			$newParam->getInfo()->setShortName($ytitle);
+		}
+		else {
+			$newParam->getInfo()->setShortName($paramId);
+		}
+		if (!empty($status)) {
+			foreach ($status as $def) {
+				$newParam->getInfo()->addStatus($def["min"], $def["max"], $def["name"], $def["color"]);
+			}
+		}
+		$constantGetNode = $newParam->addParamGet(ParamGetTypeEnum::CONSTANT);
+		$constantParamNode = $constantGetNode->addConstant();
+		$constantParamNode->setSampling(1);
+		$process = "#ttcat_to_param(\$constant_1_".$constantParamNode->getType()."_";
+		$process .= $constantParamNode->getConstValue()."_".$constantParamNode->getDim1()."_".$constantParamNode->getDim2().";".$ttCatFilePath;
+		if (!empty($flag)) {
+			$process .= ";".$flag;
+		}
+		$process .= ")";
+		$newParam->setProcess($process, "Transform Time Table or Catalog to a parameter", !$isShared);
+		$newParam->setOutput();
+
+		$this->processParamsToCreate[$paramId] = array('param' => $newParam, 'dateModif' => $dateModif);
+	}
 	public function getLocalParamsToCreate()
 	{
@@ -8,11 +8,13 @@ class ProcessClass
 {
 	private $command;
 	private $postProcessCmd;
+	private $getErrorMsgCmd;
 	private $outputFile;
 	private $exitCodeFile;
 	private $processFile;
 	private $execTimeFile;
+	private $errorMsgFile;
 	private $pID;
 	private $runningPath;
@@ -21,22 +23,24 @@ class ProcessClass
 	/*
 	 * @brief Constructor
 	*/
-	function __construct($command, $postProcessCmd = "")
+	function __construct($command, $postProcessCmd = "", $getErrorMsgCmd = "")
 	{
 		$this->command        = $command;
 		$this->postProcessCmd = $postProcessCmd;
+		$this->getErrorMsgCmd = $getErrorMsgCmd;
 		$this->pID            = 0;
 	}
 	/*
 	 * @brief Init an existing process
 	*/
-	public function init($outputFile, $exitCodeFile, $processFile, $execTimeFile, $pid, $runningPath, $runningStart)
+	public function init($outputFile, $exitCodeFile, $processFile, $execTimeFile, $errorMsgFile, $pid, $runningPath, $runningStart)
 	{
 		$this->outputFile   = $outputFile;
 		$this->exitCodeFile = $exitCodeFile;
 		$this->processFile  = $processFile;
 		$this->execTimeFile = $execTimeFile;
+		$this->errorMsgFile = $errorMsgFile;
 		$this->pID          = $pid;
 		$this->runningPath  = $runningPath;
 		$this->runningStart = $runningStart;
@@ -83,6 +87,14 @@ class ProcessClass
 	}
 	/*
+	 * @brief Get the error msg file
+	 */
+	public function getErrorMsgFile()
+	{
+		return $this->errorMsgFile;
+	}
+
+	/*
 	 * @brief Get the running path of the request
 	*/
 	public function getRunningPath()
@@ -119,6 +131,38 @@ class ProcessClass
 		return intval($result);
 	}
+	public function getErrorMsg()
+	{
+		switch ($this->getExitCode())
+		{
+			case 0:
+				return ""; //No error
+			case -1000:
+				return "No process Id";
+			case -1001:
+				return "Request is running.";
+			case -1002:
+				return "Cannot access to the request directory";
+			case -1003:
+				return "Cannot retrieve exit code file";
+			case -1004:
+				return "Cannot read exit code file";
+		}
+		if (!file_exists($this->errorMsgFile)) {
+			return "Cannot retrieve error message file";
+		}
+		$result = file_get_contents($this->errorMsgFile);
+
+		if ($result === false)
+			return "Cannot read error message file";
+
+		$result = trim($result);
+		if (empty($result))
+			return "Unknown error";
+
+		return $result;
+	}
+
 	/*
 	 * @brief Get execution time of the process
 	 */
@@ -159,6 +203,7 @@ class ProcessClass
 			return false;
 		$cmd = 'nohup ./'.$this->processFile.' > /dev/null 2>&1 & echo $!';
+
 		exec($cmd,$op);
 		$this->pID = (int)$op[0];
 		$this->runningStart = time();
@@ -215,8 +260,8 @@ class ProcessClass
 		if (!chdir($this->runningPath))
 			return false;
-		//if (!$keep_log && file_exists($this->outputFile))
-		//	unlink($this->outputFile);
+		if (!$keep_log && file_exists($this->outputFile))
+			unlink($this->outputFile);
 		if (file_exists($this->exitCodeFile))
 			unlink($this->exitCodeFile);
@@ -226,7 +271,10 @@ class ProcessClass
 		if (file_exists($this->execTimeFile))
 			unlink($this->execTimeFile);
-		 
+
+		if (file_exists($this->errorMsgFile))
+			unlink($this->errorMsgFile);
+		
 		return true;
 	}
@@ -245,6 +293,7 @@ class ProcessClass
 		$this->exitCodeFile = "cmd_exitcode";
 		$this->processFile  = "cmd_process";
 		$this->execTimeFile = "cmd_exec_time";
+		$this->errorMsgFile = "cmd_errormsg";
 		if (file_exists($this->outputFile))
 			unlink($this->outputFile);
@@ -258,12 +307,19 @@ class ProcessClass
 		if (file_exists($this->execTimeFile))
 			unlink($this->execTimeFile);
+		if (file_exists($this->errorMsgFile))
+			unlink($this->errorMsgFile);
+
 		file_put_contents($this->processFile, "#!/bin/bash".PHP_EOL);
 		foreach ($envArray as $key => $value)
 			file_put_contents($this->processFile,"export ".$key."=".$value.PHP_EOL, FILE_APPEND);
 		file_put_contents($this->processFile, "CMD_START=`echo $(($(date +%s%N)/1000000))`".PHP_EOL, FILE_APPEND);
 		file_put_contents($this->processFile, $this->command." > ".$this->outputFile." 2>&1".PHP_EOL, FILE_APPEND);
-		file_put_contents($this->processFile, "echo $? > ".$this->exitCodeFile.PHP_EOL, FILE_APPEND);
+		file_put_contents($this->processFile, "ERROR_CODE=$?".PHP_EOL, FILE_APPEND);
+		file_put_contents($this->processFile, "echo \$ERROR_CODE > ".$this->exitCodeFile.PHP_EOL, FILE_APPEND);
+		file_put_contents($this->processFile, "if [ \$ERROR_CODE -ne 0 ] && [ \"".$this->getErrorMsgCmd."\" != \"\" ]; then".PHP_EOL, FILE_APPEND);
+		file_put_contents($this->processFile, "    ".$this->getErrorMsgCmd." > ".$this->errorMsgFile.PHP_EOL, FILE_APPEND);
+		file_put_contents($this->processFile, "fi;".PHP_EOL, FILE_APPEND);
 		file_put_contents($this->processFile, "CMD_STOP=`echo $(($(date +%s%N)/1000000))`".PHP_EOL, FILE_APPEND);
 		file_put_contents($this->processFile, "echo $((\$CMD_STOP-\$CMD_START)) > ".$this->execTimeFile.PHP_EOL, FILE_APPEND);
 		if ($this->postProcessCmd != "")
@@ -19,9 +19,9 @@ class ProcessManagerClass
 	/*
 	 * @brief Run a process
 	*/
-	public function runProcess($cmd, $runningPath, $envArray, $postProcessCmd, $batchEnabled)
+	public function runProcess($cmd, $runningPath, $envArray, $postProcessCmd, $getErrorMsgCmd, $batchEnabled)
 	{
-		$process = new ProcessClass($cmd, $postProcessCmd);
+		$process = new ProcessClass($cmd, $postProcessCmd, $getErrorMsgCmd);
 		if (!$process->run($runningPath, $envArray))
 			return array("success" => false, "message" => "Cannot run the process");
@@ -159,8 +159,10 @@ class ProcessManagerClass
 		$this->updateProcessStatusToNode($dom,$processNode,"exitcodefile",$process->getExitCodeFile());
 		$this->updateProcessStatusToNode($dom,$processNode,"processfile",$process->getProcessFile());
 		$this->updateProcessStatusToNode($dom,$processNode,"exectimefile",$process->getExecTimeFile());
+		$this->updateProcessStatusToNode($dom,$processNode,"errormsgfile",$process->getErrorMsgFile());
 		$this->updateProcessStatusToNode($dom,$processNode,"exitcode",$process->getExitCode());
 		$this->updateProcessStatusToNode($dom,$processNode,"exectime",$process->getExecTime());
+		$this->updateProcessStatusToNode($dom,$processNode,"errormsg",$process->getErrorMsg());
 		$this->updateProcessStatusToNode($dom,$processNode,"PID",$process->getPID());
 		$this->updateProcessStatusToNode($dom,$processNode,"runningpath",$process->getRunningPath());
 		$this->updateProcessStatusToNode($dom,$processNode,"runningstart",$process->getRunningStart());
@@ -180,8 +182,10 @@ class ProcessManagerClass
 				"exitcodefile" => $this->getNodeValueFromNode($processNode, "exitcodefile"),
 				"processfile"  => $this->getNodeValueFromNode($processNode, "processfile"),
 				"exectimefile" => $this->getNodeValueFromNode($processNode, "exectimefile"),
+				"errormsgfile" => $this->getNodeValueFromNode($processNode, "errormsgfile"),
 				"exitcode"     => $this->getNodeValueFromNode($processNode, "exitcode"),
 				"exectime"     => $this->getNodeValueFromNode($processNode, "exectime"),
+				"errormsg"     => $this->getNodeValueFromNode($processNode, "errormsg"),
 				"PID"          => $this->getNodeValueFromNode($processNode, "PID"),
 				"runningpath"  => $this->getNodeValueFromNode($processNode, "runningpath"),
 				"runningstart" => $this->getNodeValueFromNode($processNode, "runningstart"),
@@ -239,10 +243,11 @@ class ProcessManagerClass
 		$processFile  = $processInfo["processfile"];
 		$exitCodeFile = $processInfo["exitcodefile"];
 		$execTimeFile = $processInfo["exectimefile"];
+		$errorMsgFile = isset($processInfo["errormsgfile"]) ? $processInfo["errormsgfile"] : "";
 		$pid          = $processInfo["PID"];
 		$runningPath  = $processInfo["runningpath"];
 		$runningStart = $processInfo["runningstart"];
-		$process->init($outputFile, $exitCodeFile, $processFile, $execTimeFile, $pid, $runningPath, $runningStart);
+		$process->init($outputFile, $exitCodeFile, $processFile, $execTimeFile, $errorMsgFile, $pid, $runningPath, $runningStart);
 		return $process;
 	}
@@ -32,6 +32,8 @@ class ProcessRequestClass extends RequestAbstractClass
 			}
 		}
+		$this->requestData->setGetErrorMsgCmd(KernelConfigClass::getKernelBinPath()."amdaGetErrorMsg \$ERROR_CODE");
+
 		return true;
 	}
@@ -90,6 +92,9 @@ class ProcessRequestClass extends RequestAbstractClass
 			else
 				$this->requestData->setStatus(ProcessStatusEnumClass::DONE);
 			$this->requestData->setErrorCode($processInfo['exitcode']);
+			if (!empty($processInfo['exitcode'])) {
+				$this->requestData->setErrorMsg($processInfo['errormsg']);
+			} 
 			$this->requestData->setExecTime($processInfo['exectime']);
 			$processMgr->deleteProcess($processInfo['id'], $result['success']);
 		}
@@ -121,6 +126,7 @@ class ProcessRequestClass extends RequestAbstractClass
 				$this->requestData->getWorkingPath(),
 				$this->requestData->getEnvVars(),
 				$this->requestData->getPostCmd(),
+				$this->requestData->getGetErrorMsgCmd(),
 				$this->requestData->getBatchEnable());
 				if ($result['success']) {
 					$return_code = TRUE;
@@ -40,11 +40,13 @@ class ProcessRequestDataClass extends RequestDataClass
 	private $cmd             = "";
 	private $envVars         = array();
 	private $postCmd         = "";
+	private $getErrorMsgCmd  = "";
 	private $id              = "";
 	private $type            = ProcessTypeEnumClass::UNKNOWN;
 	private $batchEnable     = true;
 	private $status          = ProcessStatusEnumClass::UNKNOWN;
 	private $exitCode        = 0;
+	private $errorMsg        = "";
 	private $execTime        = 0;
 	private $start           = 0;
 	private $runningPath = "";
@@ -99,6 +101,16 @@ class ProcessRequestDataClass extends RequestDataClass
 		$this->postCmd = $postCmd;
 	}
+	public function getGetErrorMsgCmd()
+	{
+		return $this->getErrorMsgCmd;
+	}
+
+	public function setGetErrorMsgCmd($getErrorMsgCmd)
+	{
+		$this->getErrorMsgCmd = $getErrorMsgCmd;
+	}
+
 	public function getId()
 	{
 		return $this->id;
@@ -169,6 +181,16 @@ class ProcessRequestDataClass extends RequestDataClass
 		$this->exitCode = $errorCode;
 	}
+	public function getErrorMsg()
+	{
+		return $this->errorMsg;
+	}
+
+	public function setErrorMsg($errorMsg) 
+	{
+		$this->errorMsg = $errorMsg;
+	}
+
 	public function getExecTime()
 	{
 		return $this->execTime;
@@ -33,6 +33,7 @@ class TTRequestDataClass extends RequestDataClass
 	private $cmd             = "";
 	private $envVars         = array();		
 	private $exitCode        = 0;
+	private $sendToSamp      = FALSE;
 	public function getInputFileName()
 	{
@@ -83,6 +84,16 @@ class TTRequestDataClass extends RequestDataClass
 	{
 		$this->outputDir = $outputDir;
 	}
+
+	public function setSendToSamp($sendToSamp)
+	{
+		$this->sendToSamp = $sendToSamp;
+	}
+
+	public function getSendToSamp($sendToSamp)
+	{
+		return $this->sendToSamp;
+	}
 	public function getCmd()
 	{
@@ -126,4 +137,4 @@ class TTRequestDataClass extends RequestDataClass
 	}
 }
-?>
 \ No newline at end of file
+?>