Merge branch master into install-rework

Benjamin Renard
2 parents f1252b32 9e741d41
Showing 18 changed files with 1299 additions and 182 deletions Show diff stats
src/ClientTypeEnumClass.php
src/InputOutput/IHMImpl/Config/IHMConfigClass.php
src/InputOutput/IHMImpl/IHMInputOutputClass.php
src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php
src/InputOutput/IHMImpl/Process/IHMInputOutputDeleteProcessClass.php
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
src/InputOutput/IHMImpl/Tools/IHMParamTemplateClass.php
src/InputOutput/WSImpl/Config/WSConfigClass.php
src/InputOutput/WSImpl/Params/DownloadImpl/WSInputOutputParamsDownloadClass.php
src/InputOutput/WSImpl/Params/PlotImpl/WSInputOutputParamsPlotClass.php
src/InputOutput/WSImpl/Process/WSInputOutputDeleteProcessClass.php
src/InputOutput/WSImpl/Process/WSInputOutputGetInfoProcessClass.php
src/InputOutput/WSImpl/TimeTables/WSInputOutputTTClass.php
src/InputOutput/WSImpl/Tools/WSJobsManagerClass.php
src/InputOutput/WSImpl/WSInputOutputClass.php
src/Request/ProcessRequestImpl/Process/ProcessManagerClass.php
src/RequestManagerClass.php
src/amdaintegration_autoload.php
@@ -8,6 +8,6 @@ abstract class ClientTypeEnumClass
 {
 	const IHM  = "ihm";
 	const TEST = "test";
-	const WEBSERVICE = "webservice";
+	const WS = "webservice";
 }
 ?>
@@ -75,16 +75,21 @@ class IHMConfigClass
 		return self::$userHost;
 	}
+	public static function getDataDir()
+	{
+		return IHM_SRC_DIR."/".self::$dataDir.'/';
+	}
+	
 	public static function getRelativeResultPath()
 	{
-		$userPath = self::$dataDir.self::$userName.'/'.self::$requestDir;
+		$userPath = self::$dataDir."/".self::$userName.'/'.self::$requestDir;
 		return $userPath;
 	}
 	public static function getUserPath()
 	{
-		$userPath = IHM_SRC_DIR.'/'.self::$dataDir.self::$userName.'/';
+		$userPath = self::getDataDir().self::$userName.'/';
 		if (!is_dir($userPath))
 			mkdir($userPath);
@@ -94,22 +99,27 @@ class IHMConfigClass
 	public static function getProcessManagerFilePath()
 	{
-		return IHM_SRC_DIR.'/'.self::$dataDir.self::$processMgrFile;
+		return self::getDataDir().self::$processMgrFile;
 	}
-
+	
+	public static function getGenericDataPath()
+	{
+		return IHM_SRC_DIR."/".self::$genericDataDir."/";
+	}
+	
 	public static function getConstantsFilePath()
 	{
-		return IHM_SRC_DIR.'/'.self::$genericDataDir.self::$functionsDir.self::$constantsFile;
+		return self::getGenericDataPath().self::$functionsDir.self::$constantsFile;
 	}
 	public static function getFunctionsFilePath()
 	{
-		return IHM_SRC_DIR.'/'.self::$genericDataDir.self::$functionsDir.self::$functionsFile;
+		return self::getGenericDataPath().self::$functionsDir.self::$functionsFile;
 	}
 	public static function getParamTemplateFilePath($fileName)
 	{
-		return IHM_SRC_DIR.'/'.self::$genericDataDir.self::$paramTemplateDir.$fileName.".xml";
+		return self::getGenericDataPath().self::$paramTemplateDir.$fileName.".xml";
 	}
 	public static function getTemplateParamGeneratePath()
@@ -124,7 +134,7 @@ class IHMConfigClass
 	public static function getParamTemplateListFilePath()
 	{
-		return IHM_SRC_DIR.'/'.self::$genericDataDir.self::$paramTemplateDir.self::$paramTemplateFile;
+		return self::getGenericDataPath().self::$paramTemplateDir.self::$paramTemplateFile;
 	}
 	public static function getUserParamManagerFilePath()
@@ -238,7 +248,7 @@ class IHMConfigClass
 	public static function getRemoteDataPath()
 	{
-		$remoteDataPath = IHM_SRC_DIR.'/'.self::$genericDataDir.self::$remoteDataDir;
+		$remoteDataPath = self::getGenericDataPath().self::$remoteDataDir;
 		return $remoteDataPath;
 	}
-<?php
-
-/**
- * @class IHMInputOutputClass
- * @brief Class that's implement an InputOutputInterface for AMDA IHM client.
- * @details
- */
-class IHMInputOutputClass implements InputOutputInterface
-{
-	private $inputOutput = null;
-
-	/*
-	 * @brief Constructor
-	*/
-	function __construct($userName, $userHost)
-	{
-		IHMConfigClass::setUserName($userName);
-		IHMConfigClass::setUserHost($userHost);
-	}
-
-	/*
-	 * @brief translate input data from AMDA IHM to AMDA_Integration module
-	*/
-	public function getInputData($input,$function,$requestId = "")
-	{
-		//check user workspace
-		if (IHMConfigClass::getUserName() == "" || !is_dir(IHMConfigClass::getUserPath()))
-			throw new Exception('Cannot find user workspace.');
-
-		switch ($function)
-		{
-			case FunctionTypeEnumClass::PARAMS :
-				switch ($input->nodeType)
-				{
-					case 'download' :
-						//download data
-						if ($input->downloadSrc != "0")
-							throw new Exception('Download source '.$input->downloadSrc.' not implemented for this client.');
-						$this->inputOutput = new IHMInputOutputParamsDownloadClass();
-						break;
-					case 'condition' :
-						//data mining
-						$this->inputOutput = new IHMInputOutputParamsDataMiningClass();
-						break;
-					case 'request' :
-						//plot
-						if (($input->{"file-format"} == "PNG") && ($input->{"file-output"} == "INTERACTIVE"))
-						{
-							//set working dir for interactive plot
-							$requestId = "Plot";
-						}
-						$this->inputOutput = new IHMInputOutputParamsPlotClass();
-						break;
-					case 'statistics' :
-						//catalog generation
-						$this->inputOutput = new IHMInputOutputParamsStatisticsClass();
-						break;
-					case 'killplot' :
-						$requestId = "Plot";
-						$this->inputOutput = new IHMInputOutputParamsKillPlotClass();
-						break;
-					default :
-						throw new Exception('Params request type '.$input_request->nodeType.' not implemented for this client.');
-				}
-				break;
-			case FunctionTypeEnumClass::PARAMSGEN :
-				$this->inputOutput = new IHMInputOutputParamsGeneratorClass();
-				$requestId = "ParamGen";
-				break;
-			case FunctionTypeEnumClass::ACTION :
-				$this->inputOutput = new IHMInputOutputParamsPlotClass();
-				$requestId = "Plot";
-				break;
-			case FunctionTypeEnumClass::PROCESSDELETE :
-				$this->inputOutput = new IHMInputOutputDeleteProcessClass();
-				break;
-			case FunctionTypeEnumClass::PROCESSRUNNINGINFO :
-				$this->inputOutput = new IHMInputOutputRunningInfoProcessClass();
-				break;
-			case FunctionTypeEnumClass::PROCESSGETINFO :
-				$this->inputOutput = new IHMInputOutputGetInfoProcessClass();
-				break;
-			case FunctionTypeEnumClass::PROCESSCLEAN :
-				$this->inputOutput = new IHMInputOutputCleanProcessClass();
-				break;
-			case FunctionTypeEnumClass::PROCESSGETREQUEST :
-				$this->inputOutput = new IHMInputOutputGetProcessRequestClass();
-				break;
-				/*case FunctionTypeEnumClass::TTMERGE :
-				 $this->inputOutput = new IHMInputOutputMergeTTClass();
-				break;
-				case FunctionTypeEnumClass::TTUNION :
-				$this->inputOutput = new IHMInputOutputUnionTTClass();
-				break;*/
-			case FunctionTypeEnumClass::TTCONVERT :
-				$this->inputOutput = new IHMInputOutputTTClass();
-				break;
-			case FunctionTypeEnumClass::PARAMINFO :
-				$this->inputOutput = new IHMInputOutputParamInfoClass();
-				break;
-			default :
-				throw new Exception('Request type '.$function.' not implemented for this client.');
-		}
-
-		return $this->inputOutput->getInputData($input,$function,$requestId);
-	}
-
-	/*
-	 * @brief translate output data from AMDA_Integration module to AMDA IHM
-	*/
-	public function getOutput($data)
-	{
-		if (!isset($this->inputOutput))
-			return array("success" => false, "message" => "Input Output Interface not initialized for this request");
-
-		return $this->inputOutput->getOutput($data);
-	}
-}
-
-?>
+<?php
+
+/**
+ * @class IHMInputOutputClass
+ * @brief Class that's implement an InputOutputInterface for AMDA IHM client.
+ * @details
+ */
+class IHMInputOutputClass implements InputOutputInterface
+{
+	protected $inputOutput = null;
+
+	/*
+	 * @brief Constructor
+	*/
+	function __construct($userName, $userHost)
+	{
+		IHMConfigClass::setUserName($userName);
+		IHMConfigClass::setUserHost($userHost);
+	}
+
+	/*
+	 * @brief translate input data from AMDA IHM to AMDA_Integration module
+	*/
+	public function getInputData($input,$function,$requestId = "")
+	{
+		//check user workspace
+		if (IHMConfigClass::getUserName() == "" || !is_dir(IHMConfigClass::getUserPath()))
+			throw new Exception('Cannot find user workspace.');
+
+		switch ($function)
+		{
+			case FunctionTypeEnumClass::PARAMS :
+				switch ($input->nodeType)
+				{
+					case 'download' :
+						//download data
+						if ($input->downloadSrc != "0")
+							throw new Exception('Download source '.$input->downloadSrc.' not implemented for this client.');
+						$this->inputOutput = new IHMInputOutputParamsDownloadClass();
+						break;
+					case 'condition' :
+						//data mining
+						$this->inputOutput = new IHMInputOutputParamsDataMiningClass();
+						break;
+					case 'request' :
+						//plot
+						if (($input->{"file-format"} == "PNG") && ($input->{"file-output"} == "INTERACTIVE"))
+						{
+							//set working dir for interactive plot
+							$requestId = "Plot";
+						}
+						$this->inputOutput = new IHMInputOutputParamsPlotClass();
+						break;
+					case 'statistics' :
+						//catalog generation
+						$this->inputOutput = new IHMInputOutputParamsStatisticsClass();
+						break;
+					case 'killplot' :
+						$requestId = "Plot";
+						$this->inputOutput = new IHMInputOutputParamsKillPlotClass();
+						break;
+					default :
+						throw new Exception('Params request type '.$input_request->nodeType.' not implemented for this client.');
+				}
+				break;
+			case FunctionTypeEnumClass::PARAMSGEN :
+				$this->inputOutput = new IHMInputOutputParamsGeneratorClass();
+				$requestId = "ParamGen";
+				break;
+			case FunctionTypeEnumClass::ACTION :
+				$this->inputOutput = new IHMInputOutputParamsPlotClass();
+				$requestId = "Plot";
+				break;
+			case FunctionTypeEnumClass::PROCESSDELETE :
+				$this->inputOutput = new IHMInputOutputDeleteProcessClass();
+				break;
+			case FunctionTypeEnumClass::PROCESSRUNNINGINFO :
+				$this->inputOutput = new IHMInputOutputRunningInfoProcessClass();
+				break;
+			case FunctionTypeEnumClass::PROCESSGETINFO :
+				$this->inputOutput = new IHMInputOutputGetInfoProcessClass();
+				break;
+			case FunctionTypeEnumClass::PROCESSCLEAN :
+				$this->inputOutput = new IHMInputOutputCleanProcessClass();
+				break;
+			case FunctionTypeEnumClass::PROCESSGETREQUEST :
+				$this->inputOutput = new IHMInputOutputGetProcessRequestClass();
+				break;
+				/*case FunctionTypeEnumClass::TTMERGE :
+				 $this->inputOutput = new IHMInputOutputMergeTTClass();
+				break;
+				case FunctionTypeEnumClass::TTUNION :
+				$this->inputOutput = new IHMInputOutputUnionTTClass();
+				break;*/
+			case FunctionTypeEnumClass::TTCONVERT :
+				$this->inputOutput = new IHMInputOutputTTClass();
+				break;
+			case FunctionTypeEnumClass::PARAMINFO :
+				$this->inputOutput = new IHMInputOutputParamInfoClass();
+				break;
+			default :
+				throw new Exception('Request type '.$function.' not implemented for this client.');
+		}
+
+		return $this->inputOutput->getInputData($input,$function,$requestId);
+	}
+
+	/*
+	 * @brief translate output data from AMDA_Integration module to AMDA IHM
+	*/
+	public function getOutput($data)
+	{
+		if (!isset($this->inputOutput))
+			return array("success" => false, "message" => "Input Output Interface not initialized for this request");
+
+		return $this->inputOutput->getOutput($data);
+	}
+}
+
+?>
@@ -14,8 +14,8 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 	protected $paramsData        = null;
 	protected $requestID         = "";
 	protected $requestDirPrefix  = "";
-	private   $input             = null;
-	protected $sendToSamp        = FALSE;
+	protected $input             = null;
+	protected $sendToSamp        = FALSE;
 	/*
 	 * @brief Constructor
@@ -117,13 +117,13 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 	*/
 	protected function addToJobsFile($data,$resultKey)
 	{
-		$waitingResult = $data->getWaitingResult($resultKey);
-		if ($this->sendToSamp && ($data->getStatus() == ProcessStatusEnumClass::DONE)) {
-			$waitingResult = explode("\n", file_get_contents(IHMConfigClass::getRequestPath()."/".$this->getWorkingDirName()."/".$waitingResult));
-			$waitingResult = implode(',', $waitingResult);
-			$waitingResult = rtrim($waitingResult, ',');
-		}
-
+		$waitingResult = $data->getWaitingResult($resultKey);
+		if ($this->sendToSamp && ($data->getStatus() == ProcessStatusEnumClass::DONE)) {
+			$waitingResult = explode("\n", file_get_contents(IHMConfigClass::getRequestPath()."/".$this->getWorkingDirName()."/".$waitingResult));
+			$waitingResult = implode(',', $waitingResult);
+			$waitingResult = rtrim($waitingResult, ',');
+		}
+
 		return $this->jobsManager->addJob(
 				$this->input,
 				$data->getId(),
@@ -147,42 +147,42 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 		foreach ($res['jobs'] as $jobId)
 		{
 			//delete process
-			$deleteData = new ProcessRequestDataClass();
-			$deleteData->setManagerFilePath(IHMConfigClass::getProcessManagerFilePath());
-			$deleteData->setType(ProcessTypeEnumClass::DELETE);
-			$deleteData->setId($jobId);
-				
-			$processRequest = new ProcessRequestClass();
-			$processRequest->setData($deleteData);
-
-			if ($processRequest->init())
+			$deleteData = new ProcessRequestDataClass();
+			$deleteData->setManagerFilePath(IHMConfigClass::getProcessManagerFilePath());
+			$deleteData->setType(ProcessTypeEnumClass::DELETE);
+			$deleteData->setId($jobId);
+				
+			$processRequest = new ProcessRequestClass();
+			$processRequest->setData($deleteData);
+
+			if ($processRequest->init())
 				$processRequest->run();
-			//delete job and working dir
+			//delete job and working dir
 			$this->jobsManager->deleteJob($jobId);
 		}
 	}
 	/*
 	 * @brief Marshall request result for the IHM client
 	*/
-	protected function commonMarshallResult($data,$resultKey)
-	{
-		if (!$data->getSuccess())
-			return array(
-					'success' => false,
-					'message' => $data->getLastErrorMessage());
-
-		switch ($data->getStatus())
-		{
+	protected function commonMarshallResult($data,$resultKey)
+	{
+		if (!$data->getSuccess())
+			return array(
+					'success' => false,
+					'message' => $data->getLastErrorMessage());
+
+		switch ($data->getStatus())
+		{
 			case ProcessStatusEnumClass::ERROR :
-			case ProcessStatusEnumClass::RUNNING :
+			case ProcessStatusEnumClass::RUNNING :
 			case ProcessStatusEnumClass::DONE :
-				return $this->addToJobsFile($data,$resultKey);
-			default :
-				return array(
-				'success' => false,
-				'message'   => 'Unknown Process Status');
-		}
+				return $this->addToJobsFile($data,$resultKey);
+			default :
+				return array(
+				'success' => false,
+				'message'   => 'Unknown Process Status');
+		}
 	}
 	/*
@@ -201,7 +201,7 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 		}
 		else
 		{
-			$this->requestDirPrefix = "";
+			$this->requestDirPrefix = "";
 			$this->requestID = $requestId;
 		}
@@ -233,4 +233,4 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 	abstract protected function marshallResult($data);
 }
-?>
+?>
@@ -7,7 +7,7 @@
  */
 class IHMInputOutputDeleteProcessClass implements InputOutputInterface
 {
-	private $jobsManager       = null;
+	protected $jobsManager       = null;
 	private $paramsData        = null;
 	/*
@@ -28,7 +28,7 @@ class IHMJobsManagerClass {
 	/*
 	 * @brief Load jobs file and create it if needed
 	*/
-	private function init()
+	protected function init()
 	{
 		$this->jobXmlName = IHMConfigClass::getUserJobsFile();
 		$this->jobXml = new DomDocument("1.0");
@@ -52,7 +52,7 @@ class IHMJobsManagerClass {
 	/*
 	 * @brief Create a new jobs file
 	*/
-	private function createJobsFile()
+	protected function createJobsFile()
 	{
 		$rootElement = $this->jobXml->createElement('jobs');
 		$jobsInProgress = $this->jobXml->createElement('jobsInProgress');
@@ -173,7 +173,7 @@ class IHMParamTemplateClass
 		if (!$templateHandle || !$dstHandle)
 			return "";
 		while (($line = fgets($templateHandle)) !== false) {
-			fwrite($dstHandle, $this->replaceArgs($line, $template_args));
+			fwrite($dstHandle, $this->replaceArgs($line, $template_args, $this->getArguments($param_id)));
 		}
 		fclose($templateHandle);
 		fclose($dstHandle);
@@ -218,13 +218,17 @@ class IHMParamTemplateClass
 	/*
 	 * @brief Replace args in string
 	*/
-	public function replaceArgs($string, $template_args) {
+	public function replaceArgs($string, $template_args, $arguments = array()) {
 		$result = $string;
 		if (empty($template_args)) {
 			return $result;
 		}
 		foreach ($template_args as $template_arg_key => $template_arg_value) {
 			$result = str_replace("##".$template_arg_key."##", $template_arg_value, $result);
+			if (array_key_exists($template_arg_key, $arguments) && ($arguments[$template_arg_key]['type'] == 'list')) {
+				$item_name = array_key_exists($template_arg_value, $arguments[$template_arg_key]['items']) ? $arguments[$template_arg_key]['items'][$template_arg_value] : 'Unknown';
+				$result = str_replace("@@".$template_arg_key."@@", $item_name, $result);
+			}
 		}
 		return $result;
 	}
@@ -233,17 +237,25 @@ class IHMParamTemplateClass
 	 * @brief Enrich Template args with default values
 	 */
 	private function addDefaultValues($param_id, &$template_args) {
-		$list = $this->getParamTemplates();
-		
-		if (!array_key_exists($param_id, $list) || !isset($list[$param_id]->arguments))
+		$arguments = $this->getArguments($param_id);
+		if (empty($arguments))
 			return;
-		
-		$arguments = $list[$param_id]->arguments;
 		foreach ($arguments as $arg_key => $arg_def) {
 			if (!array_key_exists($arg_key, $template_args))
 				$template_args[$arg_key] = $arg_def->default;
 		}
 	}
+
+	/*
+	 * @brief Get list of arguments for a given parameter
+	 */
+	protected function getArguments($param_id) {
+		$list = $this->getParamTemplates();
+
+		if (!array_key_exists($param_id, $list) || !isset($list[$param_id]['arguments']))
+			return array();
+		return $list[$param_id]['arguments'];
+	}
 	/*
 	 * @brief Load list of templated parameters
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @class WSConfigClass
+ * @brief Class that's contain all specific configuration of the WebServices client
+ * @details
+ */
+class WSConfigClass
+{
+	const PARAMETER     = "getparameter";
+	const PLOT          = "getplot";
+	const ORBIT         = "getorbites";
+	const DATASET       = "getdataset";
+	
+	public static $timeToBatchMode = 10;
+	public static $enableBatch = true;
+	public static $file_prefix = "result_";
+	public static $timeLimitQuery = 600; // secs
+	
+	//TODO define during installation
+	private static $xslDir = "xml/";
+	
+	private static $wsResultDir = "WSRESULT";
+	private static $jobsFile = "WSjobs.xml";
+	
+	// TODO define during installation 
+	private static $WebUrl = "http://apus.irap.omp.eu/NEWAMDA/data/";
+	
+	private static $dataSetInfoDir = "DataSetInfo";
+	
+	public static function getUrl()
+	{
+			return self::$WebUrl.self::$wsResultDir.'/';
+	}
+	
+	public static function getWsResultDir()
+	{
+			return IHMConfigClass::getDataDir().self::$wsResultDir.'/';
+	}
+	
+	public static function getWsJobsFile()
+	{
+			return IHMConfigClass::getDataDir().self::$wsResultDir.'/'.self::$jobsFile;
+	}
+	
+	public static function getDataSetInfoDir()
+	{
+			return IHMConfigClass::getGenericDataPath().self::$dataSetInfoDir.'/';
+	}
+	
+	public static function getXslDir()
+	{
+			return IHM_SRC_DIR."php/WebServices/".self::$xslDir;
+	}
+	
+	public static function getOrbitsXml()
+	{
+			return IHMConfigClass::getGenericDataPath()."LocalData/OrbitsAll.xml";
+	}
+}
+?>
@@ -0,0 +1,248 @@
+<?php
+
+/**
+ * @class WSInputOutputParamsDownloadClass
+ * @brief Implementation of IHMInputOutputParamsAbstractClass to treat download request
+ * @details
+*/
+class WSInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClass
+{
+	/*
+	 * @brief Constructor
+	*/
+	function __construct()
+	{
+		$this->paramManager     = new IHMParamManagerClass();
+		$this->jobsManager      = new WSJobsManagerClass();
+	}
+	/*
+	 * @brief method to unmarshall a download request
+	*/
+	protected function unmarshallRequest($input)
+	{
+		$requestNode = $this->paramsData->addRequestNode();
+		
+		$paramsNode = $requestNode->getParamsNode();
+
+		//unmarshall time definition
+		$this->unmarshallTimeDefinition($input, 0);
+
+		//unmarshall download output definition
+		$outputsNode = $requestNode->getOutputsNode();
+		$downloadNode = $outputsNode->addNewOutput(RequestOutputTypeEnum::DOWNLOAD);
+
+		switch ($input->timeformat)
+		{
+			case 'ISO08601' :
+				$downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::ISO);
+				break;
+			case 'unixtime' :
+				$downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::TIMESTAMP);
+				break;
+			default :
+				$downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::ISO);
+		}
+
+		switch ($input->fileformat)
+		{
+			case "CDF" :
+				$downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::CDF);
+				$formatExtension = ".cdf";
+				break;	
+			case "ASCII" :
+				$downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::ASCII);
+				$formatExtension = ".txt";
+				break;				
+			case "VOTable" :
+				$downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::VOTABLE);
+				$formatExtension = ".vot";
+				break;
+			case "netCDF" :
+				throw new Exception('File format '.$input->fileformat.' not implemented yet');
+				break;
+			default :
+				$downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::ASCII);
+				$formatExtension = ".txt";
+		}
+
+		//add params to output
+		$resultFile = WSInputOutputClass::getService();
+		$isFirst = true;
+		
+		foreach ($input->list as $param)
+		{
+			$paramInfo = $this->paramManager->addExistingParam($param->paramid, $this->paramsData, $param->template_args);
+
+			switch ($param->type) {
+				case 0:
+					//scalar - nothing to do
+					break;
+				case 1:
+					//Tab1D
+					if ($param->{'dim1-is-range'}) {
+						$template_args = array(
+							'paramid' => $paramInfo['id'],
+							'min' => $param->{'dim1-min-range'},
+							'max' => $param->{'dim1-max-range'},
+							'relateddim' => 0
+						);
+						$paramInfo = $this->paramManager->addExistingParam('sum_into_table_range', $this->paramsData, $template_args);
+					}
+					else {
+						if (($param->{'dim1-index'} != '*') && ($param->{'dim1-index'} != '')) {
+							$paramInfo['indexes'] = array();
+							$paramInfo['indexes'][] = $param->{'dim1-index'};
+						}
+					}
+					
+					if ($param->{'dim2-is-range'}) {
+						$template_args = array(
+							'paramid' => $paramInfo['id'],
+							'min' => $param->{'dim2-min-range'},
+							'max' => $param->{'dim2-max-range'},
+							'relateddim' => 1
+						);
+						$paramInfo = $this->paramManager->addExistingParam('sum_into_table_range', $this->paramsData, $template_args);
+					}
+					else {
+						if (($param->{'dim2-index'} != '*') && ($param->{'dim2-index'} != '')) {
+							$paramInfo['indexes'] = array();
+							$paramInfo['indexes'][] = $param->{'dim2-index'};
+						}
+					}
+					break;
+				case 2:
+					if (($param->{'dim1-index'} != '*') || ($param->{'dim2-index'} != '*')) {
+						$paramInfo['indexes'] = array();
+						$paramInfo['indexes'][] = "[".$param->{'dim1-index'}.",".$param->{'dim2-index'}."]";
+					}
+					break;
+			}
+			
+			$downloadNode->addParam($paramInfo['id'],$paramInfo['indexes'],$paramInfo['calib_infos']);
+			$paramsNode->addParam($paramInfo['id']);
+
+			if ( WSInputOutputClass::getService() == WSConfigClass::DATASET && $isFirst) 
+			{
+				$resultFile .= "_".$this->getDatasetIdFromParamInfo($param->paramid);
+				$isFirst = false;
+			}
+			elseif  ( WSInputOutputClass::getService() != WSConfigClass::DATASET )
+			{
+				$resultFile .= "_".$paramInfo['id'];
+				if (!empty($paramInfo['indexes']))
+					foreach ($paramInfo['indexes'] as $index)
+						$resultFile .= "_".$index;
+			}
+			
+		}
+
+		if ($input->sampling)
+		{	
+			$downloadNode->setSamplingTime($input->sampling);
+			$downloadNode->setStructure(RequestOutputDownloadStructureEnum::ONE_FILE);
+		}	
+		else {
+				$downloadNode->setStructure(RequestOutputDownloadStructureEnum::ONE_FILE_PER_PARAMETER_PER_INTERVAL);
+		}
+		
+		switch ($input->compression)
+		{
+			case "1" :
+				$extension = $formatExtension.".gz";
+				$downloadNode->addPostProcessing(RequestOutputPostProcessingEnumClass::GZIP);
+				$resultFilePrefix = "output-";
+				break;
+			case "0" :
+			default :
+				$extension = $formatExtension;
+				$resultFilePrefix = "output-";
+		}
+		
+		$resultFile .= "_".date("Ymd\THis", strtotime($input->startDate))."_".date("Ymd\THis",strtotime($input->stopDate));
+
+		$this->paramsData->addWaitingResult(WSInputOutputClass::getService(), $resultFile.$extension);
+		
+		// internal kernel output
+		$postProcessCmd  = "mv ".$resultFilePrefix."*";
+		
+		$postProcessCmd .= $extension;
+		$postProcessCmd .= " ".WSConfigClass::getWsResultDir().$resultFile.$extension;
+	
+		$this->paramsData->setPostCmd($postProcessCmd);
+		
+		
+		$this->paramsData->setBatchEnable(WSConfigClass::$enableBatch);
+
+		return $this->paramsData;
+	}
+	
+	/*
+	 * @brief Unmarshall the time definition from the WS request
+	*/
+	protected function unmarshallTimeDefinition($input, $requestIndex)
+	{
+		$requestNodes = $this->paramsData->getRequestNodes();
+		$timesNode = $requestNodes[$requestIndex]->getTimesNode();
+
+		date_default_timezone_set('UTC');
+		$timeStamp = strtotime($input->startDate);
+		$start = CommonClass::timeStampToDDTime($timeStamp);
+		$timeStamp = strtotime($input->stopDate) - strtotime($input->startDate);
+		$duration = CommonClass::timeStampToDDTime($timeStamp);
+		$timesNode->addInterval($start, $duration);			
+	}
+	
+	/*
+	* @brief Add a job to the job manager
+	*/
+	protected function addToJobsFile($data,$resultKey)
+	{
+		$waitingResult = $data->getWaitingResult($resultKey);
+		
+		return $this->jobsManager->addJob(
+				$this->input,
+				$data->getId(),
+				$this->getWorkingDirName(),
+				$data->getStatus() == ProcessStatusEnumClass::RUNNING,
+				$data->getStart(),
+				$waitingResult,
+				$data->getErrorCode()); 
+	}
+	
+	protected function getDatasetIdFromParamInfo($paramId)
+	{
+		$paramInfoFilePath = IHMConfigClass::getLocalParamDBPath().$paramId.".xml";
+		$dom = new DomDocument("1.0");
+		
+		$dom->load($paramInfoFilePath);
+		
+		return $dom->getElementsByTagName("dataset_id")->item(0)->nodeValue;
+		 
+	
+	}
+	
+	/*
+	 * @brief method to marshall the result of a download request
+	*/
+	protected function marshallResult($data)
+	{
+		if (!$data->getSuccess())
+			return array(
+					'success' => false,
+					'message' => $data->getLastErrorMessage());
+
+		switch ($data->getStatus())
+		{
+			case ProcessStatusEnumClass::ERROR :
+			case ProcessStatusEnumClass::RUNNING :
+			case ProcessStatusEnumClass::DONE :
+				return $this->addToJobsFile($data, WSInputOutputClass::getService());
+			default :
+				return array(
+				'success' => false,
+				'message'   => 'Unknown Process Status');
+		}
+	}
+}
+?>
@@ -0,0 +1,199 @@
+<?php
+/**
+ * @class WSInputOutputParamsPlotClass
+ * @brief Implementation of IHMInputOutputParamsAbstractClass to treat plot request
+ * @details
+*/
+class WSInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
+{
+	/*
+	 * @brief Constructor
+	*/
+	function __construct()
+	{
+		$this->paramManager     = new IHMParamManagerClass();
+		$this->jobsManager      = new WSJobsManagerClass();
+	}	
+	
+	/*
+	 * @brief method to unmarshall a plot request
+	*/
+	protected function unmarshallRequest($input)
+	{
+		//Request
+		$requestIndexInParamData = 0;
+		$tabRequestIndex = 1;
+
+		$postProcessCmd = "";
+	 
+		$requestNode = $this->paramsData->addRequestNode();
+		$requestNode->setRealIndex($tabRequestIndex);
+		$outputsNode = $requestNode->getOutputsNode();
+		$paramsNode  = $requestNode->getParamsNode();
+
+		//unmarshall time definition
+		$this->unmarshallTimeDefinition($input, $tabRequestIndex-1, $requestIndexInParamData);
+	
+		$plotOutputNode = $outputsNode->addNewOutput(RequestOutputTypeEnum::PLOT);
+		$plotOutputNode->setWriteContextFile("false");
+		
+		$plotOutputNode->setStructure(RequestOutputPlotStructureEnum::ONE_FILE);
+			
+		//prefix
+
+		$filePrefix = "plot";
+
+		$plotOutputNode->setFilePrefix($filePrefix);
+	
+		//page
+		$pageNode = $plotOutputNode->getPage();
+		
+		switch ($input->{'file-format'})
+		{
+			case 'PNG' :
+				$fileFormat = RequestOutputPlotPageFormatEnum::PNG;
+				$extension = ".png";
+				break;
+			case 'PDF' :
+				$fileFormat = RequestOutputPlotPageFormatEnum::PDF;
+				$extension = ".pdf";
+				break;
+			case 'PS' :
+				$fileFormat = RequestOutputPlotPageFormatEnum::PS;
+				$extension = ".ps";
+				break;
+			case 'SVG' :
+				$fileFormat = RequestOutputPlotPageFormatEnum::SVG;
+				$extension = ".svg";
+				break;
+			default:
+				throw new Exception('File format not implemented.');
+		}
+	
+		$pageNode->setFormat($fileFormat);
+		$pageNode->setOrientation(RequestOutputPlotPageOrientationEnum::LANDSCAPE);
+		$pageNode->setDimension(RequestOutputPlotPageDimensionEnum::ISO_A4);
+		$pageNode->setMode(RequestOutputPlotPageModeEnum::COLOR);
+		
+		// Layout 
+	   $pageNode->getLayout()->setType(RequestOutputPlotLayoutTypeEnum::VERTICAL);
+		$pageNode->getLayout()->setPanelHeight("0.5");
+		$pageNode->getLayout()->setPanelSpacing("0");
+		$pageNode->getLayout()->setExpand("false"); // true ?
+		$pageNode->getLayout()->setOnlyLowerTimeAxesLegend("true");
+		
+		$parametersToPlot = $input->{'parameters'}; // one parameter on panel
+
+		$panelN = 1;
+		foreach ($parametersToPlot as $param)
+		{
+			$panelNode = $pageNode->addPanel();
+			$panelNode->setId($panelN);
+			$panelNode->setIndex($panelN -1);
+			$plotNode = $panelNode->addPlotElement(RequestOutputPlotElementTypeEnum::TIMEPLOT);
+			
+			//Axes
+			$timeAxisNode = $plotNode->getTimeAxis();
+			$yAxisNode = $plotNode->addYAxis('y-left'); 
+
+			//Params
+			$this->unmarshallParams($param, $paramsNode, $plotNode, $panelNode);
+			$panelN++;
+		}
+
+		$resultFile = $filePrefix."_*".$extension;
+		$waitingResultFile = $input->{'result-file'}.$extension;
+	
+		$this->paramsData->addWaitingResult(WSInputOutputClass::getService(), $waitingResultFile);
+		
+		//Post process command to apply to the result file
+		$postProcessCmd .= "mv ".$resultFile." ".WSConfigClass::getWsResultDir().$waitingResultFile;
+
+
+		$this->paramsData->setBatchEnable(true);
+		$this->paramsData->setPostCmd($postProcessCmd);
+		
+		return $this->paramsData;
+	}
+
+	
+	protected function unmarshallParams($paramData, $requestParamsNode, $plotNode, $panelNode)
+	{
+		//Main drawing element parameter
+		$paramInfo = $this->paramManager->addExistingParam($paramData->{'paramid'}, $this->paramsData, NULL);
+					
+		$requestParamsNode->addParam($paramInfo['id']);
+		$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
+		
+		$serieNode = $paramNode->addYSerie('y-left', -1);
+		$serieNode->setId('1');
+		
+		$lineNode = $serieNode->getLine();
+		$lineNode->setType(RequestOutputPlotLineTypeEnum::LINE); 
+		
+		if ($this->isVector($paramInfo['id'])) { // vector - activate legend
+			$paramLegendNode = $plotNode->getLegends()->getParamsLegend();
+			$paramLegendNode->setType(RequestOutputPlotParamsLegendTypeEnum::TEXTONLY);
+			$paramLegendNode->setShowParamInfo("true");
+			$paramLegendNode->setShowIntervalInfo("false");
+			$paramLegendNode->setPosition("outside");
+		}
+	}
+	
+		
+	protected function isVector($paramId)
+	{
+		$paramPath = IHMConfigClass::getLocalParamDBPath().$paramId.".xml";
+		
+		$dom = new DomDocument("1.0");
+		if (!@$dom->load($paramPath))
+			return false;
+		
+		// TODO use tensor_order
+		$components = $dom->getElementsByTagName("components")->item(0)->nodeValue;
+		$arr = explode(",",$components);
+		
+		return (count($arr) == 3);
+	}
+	
+	/*
+	* @brief Add a job to the job manager
+	*/
+	protected function addToJobsFile($data,$resultKey)
+	{
+		$waitingResult = $data->getWaitingResult($resultKey);
+		
+		return $this->jobsManager->addJob(
+				$this->input,
+				$data->getId(),
+				$this->getWorkingDirName(),
+				$data->getStatus() == ProcessStatusEnumClass::RUNNING,
+				$data->getStart(),
+				$waitingResult,
+				$data->getErrorCode()); 
+	}
+	
+	/*
+	 * @brief method to marshall the result of a download request
+	*/
+	protected function marshallResult($data)
+	{
+		if (!$data->getSuccess())
+			return array(
+					'success' => false,
+					'message' => $data->getLastErrorMessage());
+
+		switch ($data->getStatus())
+		{
+			case ProcessStatusEnumClass::ERROR :
+			case ProcessStatusEnumClass::RUNNING :
+			case ProcessStatusEnumClass::DONE :
+				return $this->addToJobsFile($data, WSInputOutputClass::getService());
+			default :
+				return array(
+				'success' => false,
+				'message'   => 'Unknown Process Status');
+		}
+	}
+}
+?>
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @class WSInputOutputDeleteProcessClass
+ * @brief Class that's implement an InputOutputInterface used to treat a delete process request
+ * @details
+ */
+class WSInputOutputDeleteProcessClass extends IHMInputOutputDeleteProcessClass implements InputOutputInterface
+{
+	protected $jobsManager       = null;
+	// private $paramsData        = null;
+
+	/*
+	 * @brief Constructor
+	*/
+	function __construct()
+	{
+		$this->jobsManager      = new WSJobsManagerClass();
+	}
+
+	/*
+	 * @brief translate input data from WS client to AMDA_Integration module for a delete process request
+	*/
+// 	public function getInputData($input,$function,$requestId="")
+// 	{
+// 		if (isset($this->paramsData))
+// 			unset($this->paramsData);
+// 
+// 		$this->paramsData = new ProcessRequestDataClass();
+// 
+// 		$this->paramsData->setManagerFilePath(IHMConfigClass::getProcessManagerFilePath());
+// 		$this->paramsData->setType(ProcessTypeEnumClass::DELETE);
+// 
+// 		$this->paramsData->setId($input->id);
+// 
+// 		return $this->paramsData;
+// 	}
+
+	/*
+	 * @brief translate output data from AMDA_Integration module to IHM client for a delete process request
+	*/
+// 	public function getOutput($data)
+// 	{
+// 		if (!$data->getSuccess())
+// 		{
+// 			return array(
+// 					'success' => false,
+// 					'message' => $data->getLastErrorMessage());
+// 		}
+// 
+// 		$res = $this->jobsManager->deleteJob($this->paramsData->getId());
+// 
+// 		/*if (!$res['success'])
+// 		{
+// 			return array(
+// 					'success' => false,
+// 					'message' => $res['message']);
+// 		}*/
+// 
+// 		return array(
+// 				'success' => true,
+// 				'id'      => $this->paramsData->getId());
+// 	}
+}
+
+?>
 \ No newline at end of file
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @class WSInputOutputGetInfoProcessClass
+ * @brief Class that's implement an InputOutputInterface used to treat a get info process request
+ * @details
+ */
+class WSInputOutputGetInfoProcessClass extends IHMInputOutputGetInfoProcessClass
+{
+	protected $jobsManager       = null;
+
+	/*
+	 * @brief Constructor
+	*/
+	function __construct()
+	{
+		$this->jobsManager      = new WSJobsManagerClass();
+	}
+
+	public function getOutput($data)
+	{
+		if (!$data->getSuccess())
+		{
+			return array(
+					'success' => false,
+					'message' => $data->getLastErrorMessage());
+		}
+
+		$jobInfo = $this->jobsManager->updateJobStatus(
+					$data->getId(),
+					$data->getStatus() == ProcessStatusEnumClass::RUNNING,
+					$data->getErrorCode());
+
+		if (!$jobInfo['success'])
+		{
+			return array(
+					'success' => false,
+					'message' => $data->getLastErrorMessage());
+		}	 
+		return $jobInfo;
+	}
+}
+?>
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * @class WSInputOutputTTClass
+ * @brief 
+ * @details
+*/
+//TODO not finished and not used for the moment 
+class WSInputOutputTTClass extends IHMInputOutputTTClass
+{
+ 
+/*
+	* @brief Constructor
+*/
+	function __construct()
+	{
+		 
+	}
+
+/*
+	* @brief translate input data from IHM client to AMDA_Integration module for a tt process request
+*/
+	public function getInputData($input, $function, $requestId="")
+	{
+		if (isset($this->processDatas))
+			unset($this->processDatas);
+			
+		$final = "";
+// 		if (is_dir(IHMConfigClass::getDownloadTmpPath())) {
+// 			foreach (glob(IHMConfigClass::getDownloadTmpPath().'*.zip') as $filename)  unlink($filename);
+// 			foreach (glob(IHMConfigClass::getDownloadTmpPath().'*.tar.gz') as $filename)  unlink($filename);
+// 		}
+		
+		foreach($input->list as $ttId)
+		{
+			//create a list of data to treat
+			$processData = new TTRequestDataClass();
+			if (strpos($id,"sharedtimeTable_") === 0) {
+				//Shared TimeTable
+				$result = IHMSharedObjectsClass::getPath("timeTable", $ttId);
+				if (!$result['success'])
+					throw new Exception('Shared TimeTable '.$ttId.' not found');
+				$ttName = $result['path'];
+			}
+			else {
+				//User TimeTable
+				$ttName = IHMConfigClass::getUserTTPath().$ttId.'.xml';
+			}
+			if (!file_exists($ttName))
+				throw new Exception('TimeTable '.$ttId.' not found');
+				
+			$processData->setInputFileName($ttName);
+			$processData->setInputFileFormat(TTRequestFileFormatEnum::INTERNAL);			 
+			$processData->setOutputDir(WSConfigClass::getWSResultDir());
+			
+			$processData->setOutputFileFormat(TTRequestFileFormatEnum::VOTABLE);
+			$outputName = $ttId.'.xml';
+
+			$processData->setOutputFileName($outputName);
+
+			$processData->setType($function);
+			$processData->setCmd("ttConversion");
+									
+			$this->processDatas[] = $processData;
+		}
+		
+		$this->postProcessTT = new PostProcessTTClass();
+		$this->postProcessTT->setOutputDirAlias($this->processDatas[0]->getOutputDir());
+ 
+		$this->postProcessTT->setOutputFileName($outputFileName);
+		$this->postProcessTT->setOutputDir($this->processDatas[0]->getOutputDir());			
+
+		return $this->processDatas;
+	}
+
+/*
+	* @brief translate output data from AMDA_Integration module to IHM client  request
+*/
+	public function getOutput($data)
+	{
+
+			$result  = array('success'=>$data[0]->getSuccess(), 
+				'download' => $this->postProcessTT->getOutputDirAlias().$data[0]->getOutputFileName());
+	 		
+		return $result;
+	}
+} 
+
+?>
@@ -0,0 +1,291 @@
+<?php
+/**
+ * @class WSJobsManagerClass
+ * @brief Jobs manager
+ * @details
+ */
+class WSJobsManagerClass extends IHMJobsManagerClass {
+
+	protected $jobXml, $jobXmlName;
+
+	protected $bkgRootNode = array(WSConfigClass::PLOT => 'bkgPlotRootNode',
+			WSConfigClass::PARAMETER => 'bkgParamRootNode',
+			WSConfigClass::ORBIT => 'bkgOrbRootNode',
+			WSConfigClass::DATASET => 'bkgDatasetRootNode');
+
+	protected $resRootNode = array(WSConfigClass::PLOT => 'resPlotRootNode',
+			WSConfigClass::PARAMETER => 'resParamRootNode',
+			WSConfigClass::ORBIT => 'resOrbRootNode',
+			WSConfigClass::DATASET => 'bkgDatasetRootNode');
+
+	/*
+	 * @brief Constructor
+	*/
+	function __construct()
+	{
+	}
+
+	/*
+	 * @brief Load jobs file and create it if needed
+	*/
+	protected function init()
+	{
+		$this->jobXmlName = WSConfigClass::getWsJobsFile();
+		$this->jobXml = new DomDocument("1.0");
+
+		if (!file_exists($this->jobXmlName))
+		{
+			$res = $this->createJobsFile();
+			if (!$res['success'])
+				return $res;
+		}
+
+		$res = $this->jobXml->load($this->jobXmlName);
+		if (!$res)
+			return array(
+					"success" => false,
+					"message" => "Cannot load jobs file");
+
+		return array("success" => true);
+	}
+ 
+	/*
+	 * @brief get job info about a job
+	*/
+	public function getJobInfo($id)
+	{
+		$res = $this->init();
+		if (!$res['success'])
+			return $res;
+
+		$job = $this->jobXml->getElementById($id);
+		$format = 'unknown';
+		$compression = 'unknown';
+		if($job)
+		{
+		//	$name = $job->getAttribute('name');
+			$status = $job->getAttribute('status');
+			$jobType = $job->getAttribute('jobType');
+		//	$info = $job->getAttribute('info');
+			$start = $job->getAttribute('start');
+			$stop = $job->getAttribute('stop');
+			$result = $job->getAttribute('result');
+			$folder = $job->getAttribute('folder');
+			$request_obj = $this->getRequestObjectFile($id);
+			if (isset($request_obj))
+			{
+				if (isset($request_obj->fileformat))
+				{
+					$format = strtolower($request_obj->format);
+					if (($format == "pdf") || ($format == "ps"))
+						//auto compression for plot request
+						$compression = ".tar.gz";
+						
+					// if ($format == "ascii") $format = 'txt';
+				}
+				if (isset($request_obj->compression))
+					$compression = strtolower($request_obj->compression);
+			}
+		}
+		return array(
+				'success'     => true,
+				'id'          => $id,
+			//	'name'        => $name,
+				'status'      => $status,
+				'jobType'     => $jobType,
+			//	'info'        => $info,
+				'start'       => $start,
+				'stop'        => $stop,
+				'folder'      => $folder,
+				'result'      => $result,
+				'format'      => $format,
+				'compression' => $compression
+		);
+	}
+
+	/*
+	 * @brief Add a new job
+	*/
+	public function addJob($obj, $id, $folder,
+			$running, $start, $result, $exitcode)
+	{
+		$res = $this->init();
+		
+		if (!$res['success'])
+			return $res;
+			
+		$key = WSInputOutputClass::getService();
+		
+		$newJob = $this->jobXml->createElement('job');
+
+		$newJob->setAttribute('xml:id', $id);
+ 		$newJob->setAttribute('jobType', $key);
+
+// 		switch ($key)
+// 		{
+// 			case 'parameter' :
+// 				$name = "download_".time();
+// 				$info = '';
+// 				foreach ($obj->list as $param)
+// 				{
+// 					$info .= ' '.$param->paramid; //data
+// 				}
+// 				break;
+// 			case 'plot'	 :
+// 				$name = "request_".time();
+// 				$info = '';
+// 				for ($i=0; $i < count($obj->children); $i++) {
+// 					for ($j=0; $j < count($obj->children[$i]->children); $j++) {
+// 						$info = $info.' '.$obj->children[$i]->children[$j]->paramid;
+// 					}
+// 				}
+// 				break;
+// 			default:
+// 				$name = "unknown_".time();
+// 				$info = '';
+// 		}
+
+// 		$newJob->setAttribute('name', $name);
+// 		$newJob->setAttribute('info', $info);
+		$newJob->setAttribute('result', $result);
+		$newJob->setAttribute('folder', $folder);
+		$newJob->setAttribute('start', date('d-m-Y H:i:s', $start));
+		$newJob->setAttribute('user', IHMConfigClass::getUserName());
+		$newJob->setAttribute('host', IHMConfigClass::getUserHost());
+		//to know if know if it's an immediate job or not
+// 		$newJob->setAttribute('immediate', !$running);
+
+		if ($running)
+		{
+			$rootJobNode = $this->jobXml->getElementById($this->bkgRootNode[$key]);
+			if (!$rootJobNode)
+			{
+				$rootJobNode =  $this->jobXml->createElement("$key");
+				$rootJobNode->setAttribute('xml:id', $this->bkgRootNode[$key]);
+				$jobsInProgress = $this->jobXml->getElementsByTagName('jobsInProgress')->item(0);
+				$jobsInProgress->appendChild($rootJobNode);
+			}
+		}
+		else
+		{
+			$rootJobNode = $this->jobXml->getElementById($this->resRootNode[$key]);
+			if (!$rootJobNode)
+			{
+				$rootJobNode =  $this->jobXml->createElement("$key");
+				$rootJobNode->setAttribute('xml:id', $this->resRootNode[$key]);
+				$jobsFinished = $this->jobXml->getElementsByTagName('jobsFinished')->item(0);
+				$jobsFinished->appendChild($rootJobNode);
+			}
+		}
+
+		$rootJobNode->appendChild($newJob);
+		 
+		if (!$this->jobXml->save($this->jobXmlName))
+			return  array("success" => false, "message" => "Cannot save job manager file");
+
+		$this->saveRequestObjectFile($obj, $id);
+
+		return  $this->updateJobStatus($id, $running, $exitcode);
+	}
+
+	/*
+	 * @brief Update the status of a job
+	*/
+// 	public function updateJobStatus($id, $running, $exitcode)
+// 	{
+// 		$res = $this->init();
+// 		if (!$res['success'])
+// 			return $res;
+// 
+// 		$job = $this->jobXml->getElementById($id);
+// 
+// 		if (!isset($job))
+// 			return array("success" => false, "message" => "Cannot found job");
+// 			
+// 		$jobstatus = $this->getJobStatus($running,$exitcode);
+// 		$job->setAttribute('status', $jobstatus);
+// 
+// 		if ($running)
+// 			$job->setAttribute('stop', 'unknown');
+// 		else if ($job->getAttribute('stop') == '' || $job->getAttribute('stop') == 'unknown')
+// 		{
+// 			$job->setAttribute('stop', date('d-m-Y H:i:s', time()));
+// 			$this->jobXml->getElementById($this->resRootNode[$job->getAttribute('jobType')])->appendChild($job);
+// 		}
+// 			
+// 		$res = $this->jobXml->save($this->jobXmlName);
+// 
+// 		if (!$res)
+// 			return array(
+// 					'success' => false,
+// 					'message' => "Cannot save jobs status file");
+// 			
+// 		return $this->getJobInfo($id);
+// 	}
+	
+	/*
+	 * @brief delete a job
+	*/
+	public function deleteJob($id)
+	{
+		$res = $this->init();
+		if (!$res['success'])
+			return $res;
+
+		$job = $this->jobXml->getElementById($id);
+
+		//delete job
+		if (!$job)
+			return array('success' => false, 'message' => "Job not reachable");
+
+		$folder = $job->getAttribute('folder');
+
+		//be sure that it's an AMDA working dir before deletion...
+		$fullFolderPath = IHMConfigClass::getRequestPath().$folder.'/';
+ 
+		if ((isset($folder)) &&
+		($folder != "") &&
+		is_dir($fullFolderPath) &&
+		(preg_match("/DD[0-9A-Za-z]*_/",$folder) ||
+		 preg_match("/Plot[0-9]*_/",$folder)))
+		{
+			foreach (glob($fullFolderPath.'*') as $filename)
+			{
+				if (is_dir($filename) && (basename($filename) == 'params'))
+				{
+					//recursive deletion only for "params" dir (a full recursive deletion is probably too dangerous...)
+					foreach (glob($filename.'/*') as $paramname)
+						unlink($paramname);
+					rmdir($filename);
+				}
+				else
+					unlink($filename);
+			}
+			rmdir($fullFolderPath);
+		}
+
+		$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);
+	}
+	
+	public function getResultFromProcessId($id)
+	{
+		$res = $this->init();
+		$job = $this->jobXml->getElementById($id);
+		
+		if (!$job)
+			return array('success' => false, 'message' => "Job not reachable"); 
+		
+		return array('success' => true, 'result' => $job->getAttribute('result')); 
+	}
+}
+?>
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @class WSInputOutputClass
+ * @brief Class that's implement an InputOutputInterface for WebServices client. This class inherits from IHMInputOutputClass.
+ * @details
+ */
+class  WSInputOutputClass extends IHMInputOutputClass
+{
+	/*
+	 * @brief translate input data from WebServices request to AMDA_Integration module
+	*/
+	public static  $service;
+	
+	public static function setService($service)
+	{
+		self::$service = $service;	
+	}
+	
+	public static function getService()
+	{
+		return self::$service;	
+	}
+	
+	public function getInputData($input,$function,$requestId = "")
+	{
+		switch ($function)
+		{
+			case FunctionTypeEnumClass::PARAMS :
+				switch (self::$service)
+				{
+					case WSConfigClass::PARAMETER :
+					case WSConfigClass::DATASET :
+					case WSConfigClass::ORBIT :
+						$this->inputOutput = new WSInputOutputParamsDownloadClass();
+						break;
+					case WSConfigClass::PLOT :
+						$this->inputOutput = new WSInputOutputParamsPlotClass();
+						break;
+					default :
+						throw new Exception('Service'.self::$service.' not implemented yet');
+				}
+				break;
+			case FunctionTypeEnumClass::PROCESSDELETE :
+				$this->inputOutput = new WSInputOutputDeleteProcessClass();
+				break;
+			case FunctionTypeEnumClass::PROCESSRUNNINGINFO :
+				$this->inputOutput = new IHMInputOutputRunningInfoProcessClass();
+				break;
+			case FunctionTypeEnumClass::PROCESSGETINFO :
+				$this->inputOutput = new WSInputOutputGetInfoProcessClass();
+				break;
+			case FunctionTypeEnumClass::PROCESSCLEAN :
+				$this->inputOutput = new IHMInputOutputCleanProcessClass();
+				break;
+			case FunctionTypeEnumClass::PROCESSGETREQUEST :
+				$this->inputOutput = new IHMInputOutputGetProcessRequestClass();
+				break;
+			//TODO actually this is done by WebServer xslt transformation
+			case FunctionTypeEnumClass::TTCONVERT :
+				$this->inputOutput = new WSInputOutputTTClass();
+				break;
+			default :
+				throw new Exception('Request type '.$function.' not implemented for this client.');
+		}
+
+		return $this->inputOutput->getInputData($input,$function,$requestId);
+	}
+
+}
+
+?>
 \ No newline at end of file
@@ -261,6 +261,8 @@ class ProcessManagerClass
 						return array('success' => false, 'message' => 'Error to retrieve process info');
 					$this->updateProcessInProcessNode($dom, $processNode, $process);
+					
+					$dom->save($this->processManagerFilePath);
 				}
 				$processInfo = $this->getProcessInfoFromNode($processNode);
@@ -15,6 +15,20 @@ Class RequestManagerClass
 	{
 	}
+	
+/*
+	* @brief Treat a request that's come from the WebServices
+*/
+	public function runWSRequest($user, $userHost, $function, $service = "", $input)
+	{
+		if (isset($service))
+				WSInputOutputClass::setService($service);
+		//TODO time table conversions can be made by AMDA_Kernel
+		if ($function == FunctionTypeEnumClass::PARAMS ) // || $function == FunctionTypeEnumClass::TTCONVERT)
+				KernelConfigClass::setTimeToBatchMode(WSConfigClass::$timeToBatchMode);
+		
+		return $this->runGenericRequest(ClientTypeEnumClass::WS, $user, $userHost, $function, $input);
+	}
 /*
 	* @brief Treat a request that's come from the IHM
@@ -70,8 +84,10 @@ Class RequestManagerClass
 		{
 			case ClientTypeEnumClass::IHM :
 				return new IHMInputOutputClass($user, $userHost);
+			case ClientTypeEnumClass::WS :
+				return new WSInputOutputClass($user, $userHost);	
 			case ClientTypeEnumClass::TEST :
-				return new TestInputOutputClass($user);
+				return new TestInputOutputClass($user);	
 			default :
 				throw new Exception('Client '.$client.' not implemented.');
 		}
@@ -90,7 +106,7 @@ Class RequestManagerClass
 		//create an instance of the RequestClass to run the request
 		$request = $this->createRequest($user, $userHost, $function);
-		
+
 		if (is_array($inputdata))
 		{
 			$outputdata = array();
@@ -100,7 +116,7 @@ Class RequestManagerClass
 		}
 		else
 			$outputdata = $this->runSingleRequest($request,$inputdata);
-				
+
 		//get the request output data from the output data by using the InputOutput interface
 		return $inputOutput->getOutput($outputdata);
 	}
@@ -112,7 +128,7 @@ Class RequestManagerClass
 	{
 		//link the request to the input data
 		$request->setData($data);
-
+		
 		//init the request
 		if (!$request->init())
 		{
@@ -17,6 +17,13 @@ function amdaintegration_autoload($class_name)
 			'InputOutput/IHMImpl/Tools',
 			'InputOutput/IHMImpl/TimeTables',
 			'InputOutput/TestImpl',
+			'InputOutput/WSImpl',
+			'InputOutput/WSImpl/Config',
+			'InputOutput/WSImpl/Process',
+			'InputOutput/WSImpl/Params/DownloadImpl',
+			'InputOutput/WSImpl/Params/PlotImpl',
+			'InputOutput/WSImpl/Tools',
+			'InputOutput/WSImpl/TimeTables',
 			'Request',
 			'Request/Config',
 			'Request/ParamsRequestImpl',
@@ -31,7 +38,9 @@ function amdaintegration_autoload($class_name)
 	$ihm_dirs = array(
 			IHM_SRC_DIR.'/php/classes',
-			IHM_SRC_DIR.'/php/RemoteDataCenter'
+			IHM_SRC_DIR.'/php/RemoteDataCenter',
+			IHM_SRC_DIR.'/php/WebServices',
+			IHM_SRC_DIR.'/php/WebServices/Client'
 	);
    $find = false;