Merge branch master into install-rework

Benjamin Renard
2 parents fe226876 782f5cae
Showing 30 changed files with 1277 additions and 1413 deletions Show diff stats
generic_data/SpecialSettings/Settings.xml
js/app/controllers/ExplorerModule.js
js/app/views/ExplorerUI.js
js/resources/css/amda.css
js/resources/images/16x16/align_left.png
js/resources/images/trash.png
php/AMDA_METHODS_WSDL.php
php/classes/WSClientInterface.php -> php/WebServices/Client/WSClientInterface.php
php/classes/WSClientREST.php -> php/WebServices/Client/WSClientREST.php
php/classes/WSClientSOAP.php -> php/WebServices/Client/WSClientSOAP.php
php/testWebServer.php -> php/WebServices/Tests/testWebServer.php
php/classes/WSUserMgr.php -> php/WebServices/WSUserMgr.php
php/WebServices/WebServer.php
php/WebServices/xml/AmdaPlots.xml
php/WebServices/xml/xml2vot.xsl
php/classes/AmdaAction.php
php/classes/RequestMgr.php
php/classes/UserMgr.php
php/classes/WebServer.php
php/config.php
 <?xml version="1.0"?>
-<users>
-	   <user xml:id="budnik">
+<users>    
+    <user xml:id="genot">
         <!--- 1024*1024*1000 pour 1000Mo -->
-        <setting name="DISK_QUOTA" value="1048576000"/>       
+        <setting name="DISK_QUOTA" value="1048576000"/>
+        <setting isSetting='true' name="memory_limit" value="100000000"/> 
+        <setting isSetting='true' name="max_execution_time" value="1200"/>
+    </user>
+    <user xml:id="budnik">
+        <!--- 1024*1024*1000 pour 1000Mo -->
+        <setting name="DISK_QUOTA" value="1048576000"/>
         <setting isSetting='true' name="memory_limit" value="100000000"/> 
         <setting isSetting='true' name="max_execution_time" value="1200"/>
     </user>
@@ -105,29 +105,19 @@ Ext.define(&#39;amdaDesktop.ExplorerModule&#39;,
               region: 'center'
             },
             {
-              xtype: 'label',
-              text: 'Log:',
-              margin: '10 0 -5 0',
-              region: 'south',
-              height: 20
-            },
-            {
               xtype: 'panel',
+              title: 'Log',
               id: 'LogPanel',
+              collapsible: true,
+              iconCls: 'icon-align-left',
               region: 'south',
-              height: 150,
               split: true,
-              layout: {
-                type: 'vbox',
-                align: 'stretch',
-                autoSize: true
-              },
-              autoScroll: true,
+              height: 150,
               stateful: true,
               stateId: 'LogPanel',
-              buttons: [{
-                scope: this,
-                text: 'Clear',
+              tools: [{
+                type: 'trash',
+                tooltip: 'Clear logs',
                 handler: function () {
                   var logPanel = win.items.get('LogPanel')
                   logPanel.removeAll()
@@ -506,6 +506,9 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 				},
 				itemcontextmenu: function(view, rec, item, index, e){
+					// Add record to selection model
+					view.ownerCt.getSelectionModel().select(rec);
+
 					// block other events
 					e.stopEvent();
@@ -104,6 +104,10 @@
     background-image:url( ../images/16x16/workspaces.png ) !important;
 }
+.icon-align-left {
+    background-image: url(../images/16x16/align_left.png);
+}
+
 .icon-delete {
     background-image:url( ../images/icons/fam/delete.gif ) !important;
 }
@@ -121,6 +125,14 @@ background-image: url(../images/small_cancel_centered.png);
 }
 /**
+Custom tool typ icons
+ */
+
+.x-tool-trash {
+    background-image: url(../images/trash.png) !important;
+}
+
+/**
  * RangeMenu Styles
  **/
@@ -489,6 +501,10 @@ p + p {
 	opacity: 1.0 !important;
 }
+#LogPanel-splitter-collapseEl {
+	display: none;
+}
+
 .epntap_grid .disabled_row {
 	color: gray;
 }
@@ -504,4 +520,4 @@ p + p {
 .epntap_cell {
 	padding: 4px;
 	white-space: normal;
-}
 \ No newline at end of file
+}
@@ -2,17 +2,14 @@
 /** 
 *   @file AMDA_METHODS_WSDL.php
-*   @brief PHP SoapServer for IMPEx WebServices
-*
-*   @version  $Id: $
-*   
+*   @brief PHP SoapServer for IMPEx WebServices  
 */
-  require_once 'config.php';
-
-  ini_set("soap.wsdl_cache_enabled", "0"); // desactive le cache WSDL
-  $server = new SoapServer('../public/wsdl/Methods_AMDA.wsdl');  
-  $server->setClass('WebServer');
-  $server->handle();
+	require_once 'config.php';
+	ini_set("soap.wsdl_cache_enabled", "0"); // desactive le cache WSDL
+	$server = new SoapServer('../public/wsdl/Methods_AMDA.wsdl');  
+	$server->setClass('WebServer');
+	$server->handle();
+  
 ?>
 \ No newline at end of file
@@ -4,6 +4,7 @@ abstract class WSOutputFileFormat
 	const NETCDF  = "netCDF";
 	const VOTABLE = "VOTable";
 	const ASCII   = "ASCII";
+	const CDF   = "CDF";
 }
 abstract class WSOutputTimeFormat
@@ -29,7 +30,7 @@ abstract class WSOrbitUnit
 abstract class WSSpacecraft
 {
-	const CASSINI       = "Cassini_Public";
+	const CASSINI       = "Cassini";
 	const GALILEO       = "Galileo";
 	const VOYAGER1      = "Voyager_1";
 	const VOYAGER2      = "Voyager_2";
@@ -117,7 +118,9 @@ Interface WSClientInterface
 	public function getParameter($startTime, $stopTime, $parameterID, $sampling = 0, $userID = "", $password = "",
 			$outputFormat = WSOutputFileFormat::NETCDF, $timeFormat = WSOutputTimeFormat::ISO, $gzip = 0);
-
+			
+	public function getStatus($processID);
+	
 	public function getDataset($startTime, $stopTime, $datasetID, $sampling = 0, $userID = "", $password = "",
 			$outputFormat = WSOutputFileFormat::NETCDF, $timeFormat = WSOutputTimeFormat::ISO, $gzip = 0);
@@ -83,7 +83,16 @@ class WSClientSOAP implements WSClientInterface
 		return $this->call(__FUNCTION__, $params);
 	}
-
+	
+	public function getStatus($processID)
+	{
+		$params = array('parameters' => array(
+				"id" => $processID
+		));
+		
+		return $this->call(__FUNCTION__, $params);
+	}
+	
 	public function getDataset($startTime, $stopTime, $datasetID, $sampling = 0, $userID = "", $password = "",
 			$outputFormat = WSOutputFileFormat::NETCDF, $timeFormat = WSOutputTimeFormat::ISO, $gzip = 0)
 	{
 <?php 
-require_once("classes/WSClientSOAP.php");
-require_once("classes/WSClientREST.php");
+require_once("../Client/WSClientSOAP.php");
+//require_once("../Client/WSClientREST.php");
 function runSuiteTests($client)
 {
@@ -11,44 +11,44 @@ function runSuiteTests($client)
 		echo "[ERROR] - Error during call of isAlive function".PHP_EOL;
 	else
 		echo "[OK] - isAlive".PHP_EOL;
-	
+ 
 	//Test getTimeTablesList function without userID & password
-	$res = $client->getTimeTablesList();
-	if (!isset($res) || !$res->success)
-		echo "[ERROR] - Error during call of getTimeTablesList function - Test 1".PHP_EOL;
-	else
-		echo "[OK] - getTimeTablesList - Test 1 - ".$res->TimeTablesList.PHP_EOL;
-	
+// 	$res = $client->getTimeTablesList();
+// 	if (!isset($res) || !$res->success)
+// 		echo "[ERROR] - Error during call of getTimeTablesList function - Test 1".PHP_EOL;
+// 	else
+// 		echo "[OK] - getTimeTablesList - Test 1 - ".$res->TimeTablesList.PHP_EOL;
+		 
 	//Test getTimeTablesList function with userID & password
-	$res = $client->getTimeTablesList("testKernel", "amda");
+	$res = $client->getTimeTablesList("budnik", "Sacre-Cour");
 	if (!isset($res) || !$res->success)
 		echo "[ERROR] - Error during call of getTimeTablesList function - Test 2".PHP_EOL;
 	else
 		echo "[OK] - getTimeTablesList - Test 2 - ".$res->TimeTablesList.PHP_EOL;
-	
+ 
 	//Test getTimeTable function without userID & password
-	$res = $client->getTimeTable("sharedtt_0");
-	if (!isset($res) || !$res->success)
-		echo "[ERROR] - Error during call of getTimeTable function - Test 1".PHP_EOL;
-	else
-		echo "[OK] - getTimeTable - Test 1 - ".$res->ttFileURL.PHP_EOL;
-	
+// 	$res = $client->getTimeTable("sharedtt_0");
+// 	if (!isset($res) || !$res->success)
+// 		echo "[ERROR] - Error during call of getTimeTable function - Test 1".PHP_EOL;
+// 	else
+// 		echo "[OK] - getTimeTable - Test 1 - ".$res->ttFileURL.PHP_EOL;
+		 
 	//Test getTimeTable function with userID & password
-	$res = $client->getTimeTable("tt_0", "testKernel", "amda");
+	$res = $client->getTimeTable("tt_0", "budnik", "Sacre-Cour");
 	if (!isset($res) || !$res->success)
 		echo "[ERROR] - Error during call of getTimeTable function - Test 2".PHP_EOL;
 	else
 		echo "[OK] - getTimeTable - Test 2 - ".$res->ttFileURL.PHP_EOL;
-	
+	 
 	//Test getParameterList function for impex user
-	$res = $client->getParameterList("impex");
-	if (!isset($res) || !$res->success)
-		echo "[ERROR] - Error during call of getParameterList function - Test 1".PHP_EOL;
-	else
-		echo "[OK] - getParameterList - Test 1 - ".$res->ParameterList->LocalDataBaseParameters.PHP_EOL;
-	
+// 	$res = $client->getParameterList("impex");
+// 	if (!isset($res) || !$res->success)
+// 		echo "[ERROR] - Error during call of getParameterList function - Test 1".PHP_EOL;
+// 	else
+// 		echo "[OK] - getParameterList - Test 1 - ".$res->ParameterList->LocalDataBaseParameters.PHP_EOL;
+	 
 	//Test getParameterList function with userID & password
-	$res = $client->getParameterList("testKernel", "amda");
+	$res = $client->getParameterList("budnik", "Sacre-Cour");
 	if (!isset($res) || !$res->success)
 		echo "[ERROR] - Error during call of getParameterList function - Test 2".PHP_EOL;
 	else
@@ -57,7 +57,7 @@ function runSuiteTests($client)
 		echo "		- UserDefinedParameters : ".$res->ParameterList->UserDefinedParameters.PHP_EOL;
 		echo "		- LocalDataBaseParameters : ".$res->ParameterList->LocalDataBaseParameters.PHP_EOL;
 	}
-	
+	 
 	//Test getObsDataTree function
 	$res = $client->getObsDataTree();
 	if (!isset($res) || !$res->success)
@@ -150,7 +150,7 @@ function runSuiteTests($client)
 	}
 }
-$clientSOAP = new WSClientSOAP("http://localhost/NEWAMDA-BENJAMIN/public/wsdl/Methods_AMDA.wsdl");
+$clientSOAP = new WSClientSOAP("http://apus.irap.omp.eu/NEWAMDA/public/wsdl/Methods_AMDA.wsdl");
 echo "==> Suite tests for SOAP client".PHP_EOL;
 runSuiteTests($clientSOAP);
@@ -8,31 +8,37 @@
 class WSUserMgr extends UserMgr 
 {
 	protected $isSoap;
+	
+	private function throwError($errorType, $msg)
+	{
+		if ($this->isSoap) 
+			throw new SoapFault($errorType, $msg); 
+		else 
+			return array("error" => $msg);
+	}
-	/*****************************************************************
-	 *                           PUBLIC FUNCTIONS
-	 *****************************************************************/
-
-	public function init($username, $password, $sessionID, $isSoap) 
+	public function init($username, $password, $sessionID, $setPathOnly, $isSoap) 
 	{
 		$this->user = trim($username);
-		$this->sessionID = trim($sessionID);
-		$this->passwd = trim($password);		
+		if (isset($sessionID))
+			$this->sessionID = trim($sessionID);
+		if (isset($password))
+			$this->passwd = trim($password);		
 		$this->isSoap = isset($isSoap);
-		// Check if user has DD session already open, otherwise - login
-		if ($this->ddCheckUser() != 0) 
+		if (isset($password) && ! $setPathOnly)
 		{
-			if ($this->ddLogin() != 0) { // DD Login if user is not registered
-				if ($this->isSoap) throw new SoapFault("error", "Login procedure failed");
-				else return array("error" => "Login procedure failed");
-			}
-
+			// Check if user has DD session already open, otherwise - login
 			if ($this->ddCheckUser() != 0) 
 			{
-				if ($this->isSoap) throw new SoapFault("error", "CheckUser procedure failed");
-				else return array("error" => "CheckUser procedure failed");
+				if ($this->ddLogin() != 0) { // DD Login if user is not registered
+					$this->throwError("loginError", "Login procedure failed");
+				}
+
+				if ($this->ddCheckUser() != 0) {
+					$this->throwError("loginError", "CheckUser procedure failed");
+				}
 			}
 		}
@@ -41,30 +47,18 @@ class WSUserMgr extends UserMgr
 		if (!is_dir($this->userdir)) 
 		{
 			if (!$this->createDir()) {
-				if ($this->isSoap) throw new SoapFault("error", "Cannot create UserDir");
-				else return array("error" => "Cannot create UserDir"); 
+				$this->throwError("loginError", "Cannot create UserDir"); 
 			}
 		}
-		
-	//	$this->userWS = USERPATH . "/" . $this->user . "/WS/";
-	//	chmod($this->userWS, 0775);
-	//	$this->userMissions = $this->getAvailableMissionsByUser();
 		$this->setPath();
-		
-		return array('success' => true);
-	}
-
-	public function makeUserWS() 
-	{
-		 if (file_exists(USERWSDIR.'LocalParams.xml'))
-			unlink(USERWSDIR.'LocalParams.xml');      
-		// if (!file_exists(USERWSDIR.'LocalParams.xml'))
-		symlink(DATAPATH.'/LocalData/LocalParams.xml', USERWSDIR.'LocalParams.xml');
-		// $this->makeLocalTree();
+		if ( $setPathOnly )
+			return array('success' => true);
+			
+		$this->makeLocalTree();
 		$this->makeRemoteTree();
-		return $this->user;
+		return array('success' => true);
 	}
 }
 ?>
 \ No newline at end of file
@@ -0,0 +1,736 @@
+<?php
+/** 
+*   @file WebServer.php
+*   @brief  Web services AMDA
+*/
+
+class WebServer
+{
+	private $isSoap = false;
+	private $userID, $userPWD = null, $sessionID = null, $IPclient;
+	private $dataFileName;
+	private $requestManager = null;
+	private $paramLoader = null;
+	private $service;
+	private $requestTime;
+	
+	function __construct() 
+	{
+		if (!is_dir(WSConfigClass::getWsResultDir())) mkdir(WSConfigClass::getWsResultDir(), 0775);
+	}
+
+	protected function init($data) 
+	{
+		$this->requestTime = date('Ymd',time());
+		
+		if (!isset($data)) {
+			$this->userID  = 'impex';
+			return array('success' => true);
+		}
+		
+		if(is_object($data)){
+			$vars = get_object_vars($data);
+			$this->isSoap = true; 
+		}
+		else {
+			$vars = $data;
+		}
+
+		if (isset($vars['userID'])){
+			$this->userID  = $vars['userID'];
+		}
+		else {
+			$this->userID  = 'impex';
+		}
+		
+		$this->sessionID = $this->userID;
+		
+		if (isset($vars['password']))
+			$this->userPWD = $vars['password'];
+		else 
+			$this->userPWD = 'impexfp7';
+		
+		return array('success' => true, 'vars' => $vars);
+	}
+	
+	private function initUserMgr($setPatOnly = false) 
+	{
+		$wsUserMgr = new WSUserMgr();
+		$wsUserMgr->init($this->userID, $this->userPWD, $this->sessionID,  $setPatOnly, $this->isSoap);
+		
+		$this->IPclient = $wsUserMgr->getIPClient();
+		
+		return array('success' => true);
+	}
+	
+	private function throwError($errorType, $msg)
+	{
+		if ($this->isSoap) 
+			throw new SoapFault($errorType, $msg); 
+		else 
+			return array("error" => $msg);
+	}
+	
+	private function isGetPlotRequest($name){
+
+		return (substr($name,0,7) == 'getplot');
+	}
+	
+	private function xsl2vot($inputName, $outputName) 
+	{   
+		// Load Time table
+		$xml = new DomDocument("1.0");
+		if (!@$xml->load($inputName))
+			$this->throwError("wokrspaceError", "Cannot load time table $inputName for ".$this->userID);
+
+		// Load XSL file
+		$xsl = new DomDocument("1.0");
+		if (!@$xsl->load(WSConfigClass::getXslDir()."xml2vot.xsl"))
+			$this->throwError("systemError", "Cannot load xsl file");
+	
+		// Import XSL and write output file in vot format
+		$xslt = new XSLTProcessor();
+		$xslt->importStylesheet($xsl);
+		$vot = new DomDocument("1.0");
+		if (!@$vot->loadXML($xslt->transformToXML($xml)))
+				$this->throwError("systemError", "Cannot convert time table to VOtable");
+		
+		if (!$vot->save(WSConfigClass::getWsResultDir().$outputName))
+			$this->throwError("systemError", "Cannot save time table to result dir");
+	}
+
+	private function getDatasetInfo($id)
+	{
+		$dataSetXml = WSConfigClass::getDataSetInfoDir().$id.".xml";
+      
+		if (!file_exists($dataSetXml))
+			$this->throwError("systemError", "Cannot find info file for dataset ".$id); 
+			
+		$dataSetDom = new DomDocument("1.0");
+		
+		if (!@$dataSetDom->load($dataSetXml))
+			$this->throwError("systemError", "Cannot load info file for dataset ".$id); 
+			
+		return $dataSetDom;
+	}
+	
+/*
+*  get user TimeTables list; Shared for impex
+*/
+	private function getTimeTablesCatalogsList($object) 
+	{
+		$this->initUserMgr(true);
+		$dom = new DOMDocument("1.0");
+		
+		if ($this->userID == 'impex') {
+			$sharedObjMgr = new SharedObjectsMgr();
+			if (!@$dom->load($sharedObjMgr->getTreeFilePath()))
+					$this->throwError("workspaceError", "Workspace Error : Cannot load Shared TimeTable list");
+		}
+		else {
+				if (!@$dom->load(USERWSDIR.'Tt.xml'))
+					$this->throwError("workspaceError", "Workspace Error : Cannot load TimeTable list for ".$this->userID);
+		}
+    
+		$tagName = $object == "timetables" ? "timetabList" : "catalogList";
+		$timetabNode = $dom->getElementsByTagName($tagName);
+
+		if ($timetabNode->length < 1){
+				$this->throwError("workspaceWarning", "Workspace Warning : No $object");
+		}
+		
+		$outDOM = new DOMDocument("1.0");
+		$outDOM->formatOutput = TRUE;
+		$outDOM->preserveWhiteSpace = FALSE;
+    
+		$newNode = $outDOM->importNode($timetabNode->item(0),TRUE);
+		$outDOM->appendChild($newNode);
+		
+		$ttListResult = $object.'_'.$this->userID.'_'.$this->requestTime.'.xml';
+		
+		if (!$outDOM->save(WSConfigClass::getWsResultDir().$ttListResult))
+			$this->throwError("workspaceError", "Workspace Error : problem while saving $object list file");
+
+		return WSConfigClass::getUrl().$ttListResult;
+	}
+
+/*
+*  Get corresponding orbit parameter ID
+*/
+	private function getOrbitParameter($orbitRequest) 
+	{
+		if (!file_exists(WSConfigClass::getOrbitsXml()))
+			$this->throwError('systemError', "No AMDA system orbits file");
+			
+		$orbitsXml = new DomDocument();
+
+		if (!@$orbitsXml->load(WSConfigClass::getOrbitsXml()))
+			$this->throwError('systemError', "Cannot load AMDA system orbits file");
+			
+		$spacecraft = strtolower($orbitRequest['spacecraft']);
+		$spacecraft = str_replace('-', '', $spacecraft);
+		
+		$xpath = new DOMXpath($orbitsXml);
+		$path = '//orbites[@mission="'.$spacecraft.'" and @coordinate_system="'.$orbitRequest['coordinateSystem'].'" and @units="'.$orbitRequest['units'].'" ] ';
+
+		$orbits = $xpath->query($path);
+		
+		foreach ($orbits as $orbit)
+		{
+			$datasetID = strtr($orbit->getAttribute('dataset'),"_","-");
+			$dataSetDom = $this->getDatasetInfo($datasetID); 
+  
+			$paramStart = strtotime($dataSetDom->getElementsByTagName('global_start')->item(0)->nodeValue);
+			$paramStop =  strtotime($dataSetDom->getElementsByTagName('global_stop')->item(0)->nodeValue);
+
+			if(($paramStart <= strtotime($orbitRequest['startTime']) && (strtotime($orbitRequest['stopTime'])) <= $paramStop)) { 
+
+				return array('success' => true, 
+								 'parameterID' => $orbit->getAttribute('xml:id')   
+				);
+			}
+		}
+		
+		$this->throwError('systemError', 
+		"Cannot find orbit data for ".$orbitRequest['spacecraft']." for ".$orbitRequest['startTime']."-".$orbitRequest['stopTime']." in ".$orbitRequest['units']."  ".$orbitRequest['coordinateSystem']."($paramStart  - $paramStop)");
+	}
+	
+	private function doDownloadRequest($interval, $paramList, $formatInfo) 
+	{
+		if (!isset($this->paramLoader))
+			$this->paramLoader = new IHMUserParamLoaderClass();
+
+		//Build parameter list
+		$params = array();
+		
+		//TODO template arguments to implement ?
+		foreach ($paramList['params'] as $paramId)
+		{
+			$param = new stdClass;
+			
+			if (preg_match("#^ws_#",$paramId))
+			{
+				$res = $this->paramLoader->getDerivedParameterNameFromId($paramId);
+				
+				if (!$res["success"]) {
+					$this->throwError("serverError", "Not available derived parameter $paramId");
+				}
+				$param->paramid = "ws_".$res['name'];
+			}
+			else if (preg_match("#^wsd_#",$paramId))
+			{
+				$res = $this->paramLoader->getUploadedParameterNameFromId($paramId);
+				
+				if (!$res["success"]){
+					$this->throwError("serverError", "Not available parameter $paramId");
+				}
+				$param->paramid = "wsd_".$res['name'];
+			}
+			else {
+				$param->paramid = $paramId;
+			}
+			$params[] = $param;
+		}
+
+		$obj = (object)array(
+						"sampling" => $interval['sampling'],
+						"startDate" => $interval['startTime'],
+						"stopDate" => $interval['stopTime'],
+						"list" => $params,
+						"fileformat" => $formatInfo['format'],
+						"timeformat" => $formatInfo['timeFormat'],
+						"compression" => $formatInfo['gzip']
+			);	
+			
+		if (!isset($this->requestManager))
+			$this->requestManager = new RequestManagerClass();
+		 
+		try {
+			$downloadResult = $this->requestManager->runWSRequest($this->userID, $this->IPclient, FunctionTypeEnumClass::PARAMS, $this->service, $obj);
+		} catch (Exception $e) {
+			$this->throwError("executionError", "Exception detected : ".$e->getMessage()); 
+		}
+			
+		if (!$downloadResult['success']) {
+			$this->throwError("serverError", $downloadResult['message']);
+		}
+		
+		if($downloadResult['status'] == 'in_progress') {
+			return ['success' => true, 'status' => 'in progress', 'id' => $downloadResult['id']];
+		} elseif ($downloadResult['status'] == 'done') 
+		{
+			$this->deleteProcess($downloadResult['id']);
+			return array('success' => true, 'status' => 'done', 'dataFileURLs' => WSConfigClass::getUrl().$downloadResult['result']);
+		} else {
+			return ['success' => false, 'message' => 'Unknown status ' . $downloadResult['status']];
+		} 
+	}
+	
+/*
+*         delete process after execution : 
+*         delete temporary files/folders ( JOBS/process_xxxx, RES/DDxxx ); 
+*         delete job node in processManager.xml
+*/
+	private function deleteProcess($id)
+	{
+		$obj = (object)array('id' => $id);
+   
+		if (!isset($this->requestManager))
+			$this->requestManager = new RequestManagerClass();
+
+		try {
+			$downloadResult = $this->requestManager->runWSRequest($this->userID, $this->IPclient, FunctionTypeEnumClass::PROCESSDELETE, null, $obj);
+		} catch (Exception $e) {
+			$this->throwError("deleteProcessError", $e->getMessage());
+		}
+	}
+
+/*
+*   generate AUTH token for access to REST services 
+*/
+	public function getNewToken()
+	{
+		// generate token from timeStamp and some salt
+		$newToken = md5(1321 * (int)( time() / WSConfigClass::$timeLimitQuery));
+		
+		return array('success' => true, 'token' => $newToken);
+	}
+
+/************************** WEB SERVICES **************************************/	
+
+/*
+*   public data only : user impex
+*/
+	public function getObsDataTree() 
+	{         
+		$res = $this->init();	
+		$this->initUserMgr();
+		
+		$locParamSrc = USERWSDIR.'LocalParams.xml'; 
+		$locParamDst = substr(strtolower(__FUNCTION__),3).'_'.$this->userID.'_'.$this->requestTime.'_AmdaLocalDataBaseParameters.xml';
+
+		if (!copy($locParamSrc,WSConfigClass::getWsResultDir().$locParamDst))
+			$this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file');   
+
+		return  array('success' => true,'WorkSpace' => array("LocalDataBaseParameters" => WSConfigClass::getUrl().$locParamDst));
+	}
+
+/*
+*   get Parameter List for given user
+*/
+	public function getParameterList($data) 
+	{         
+		$res = $this->init($data);
+		$this->initUserMgr(); 
+
+		$vars = $res['vars'];
+
+		$locParamSrc = USERWSDIR.'LocalParams.xml'; 
+		$wsParamSrc =  USERWSDIR.'WsParams.xml';
+		
+		$locParamDst = substr(strtolower(__FUNCTION__),3).'_'.$this->userID.'_'.$this->requestTime.'_AmdaLocalDataBaseParameters.xml';
+		$wsParamDst = substr(strtolower(__FUNCTION__),3).'_'.$this->userID.'_'.$this->requestTime.'_UserDefinedParameters.xml';
+
+		if (!copy($locParamSrc, WSConfigClass::getWsResultDir().$locParamDst))
+			$this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file for '.$this->userID);
+		
+		if (!copy($wsParamSrc, WSConfigClass::getWsResultDir().$wsParamDst))
+			$this->throwError('workspaceError', 'No User Defined Parameters description file for '.$this->userID);  
+  
+		return  array('success' => true,'ParameterList' => 
+					array("UserDefinedParameters" => WSConfigClass::getUrl().$wsParamDst, 
+							"LocalDataBaseParameters" =>  WSConfigClass::getUrl().$locParamDst, 
+							"RemoteDataBaseParameters" => "not implemented"));
+	}
+
+/*
+*   getParameter 
+*/
+	public function getParameter($data) 
+	{
+		$res = $this->init($data);
+    
+		if (!$res['success']){
+			$this->throwError("requestError", "Cannot parse request"); 
+		}
+
+		$this->initUserMgr();
+
+		$vars = $res['vars'];
+
+		if (strtotime($vars["stopTime"]) <= strtotime($vars["startTime"])){
+			$this->throwError("requestError", "Requested time interval should be greater than 0");
+		}
+		
+		$paramId = array();
+		array_push($paramId, $vars["parameterID"]);
+
+		if (!$vars["timeFormat"])
+			$timeFormat = "ISO8601";
+		else
+			$timeFormat = $vars["timeFormat"];
+
+		if (!$vars["gzip"])
+			$gzip = 0;
+		else
+			$gzip = $vars["gzip"];
+
+		if (!$vars["stream"])
+			$stream = 0;
+		else
+			$stream = $vars["stream"];
+			
+		$this->service = strtolower(__FUNCTION__);
+
+		$res = $this->doDownloadRequest(
+					array("startTime" => $vars["startTime"], "stopTime" => $vars["stopTime"], "sampling" => $vars["sampling"]),
+					array("params" => $paramId),
+					array("format" => $vars["outputFormat"], "timeFormat"=> $timeFormat, "gzip"=>$gzip, "stream"=>$stream));
+ 
+		if ($res['success']) 
+			return $res;
+	
+		$this->throwError("serverError", $res['message']);   	
+	}
+	
+/*
+*  get user Catalogs list; Shared for impex
+*/
+	public function getCatalogsList($data) 
+	{
+		$this->init($data);
+		$this->init($data);
+		return array('success' => true, 'CatalogsList' => $this->getTimeTablesCatalogsList('catalogs'));
+	}
+
+/*
+*  get user TimeTables list; Shared for impex
+*/
+	public function getTimeTablesList($data) 
+	{
+		$this->init($data);
+		 
+		return array('success' => true, 'TimeTablesList' => $this->getTimeTablesCatalogsList('timetables'));
+	}
+	
+	public function isAlive()
+	{ 
+		return true;
+	}
+    
+/*
+*   get Dataset
+*/
+	public function getDataset($data) 
+	{
+		$res = $this->init($data);
+		
+		if (!$res['success']){
+			$this->throwError("requestError", "Cannot parse request"); 
+		}
+		
+		$this->initUserMgr();
+
+		$vars = $res['vars'];
+
+		if (strtotime($vars["stopTime"]) <= strtotime($vars["startTime"])){
+			$this->throwError("requestError", "Requested time interval should be greater than 0");
+		}
+		
+		$dataSetDom = $this->getDatasetInfo($vars['datasetID']);
+		
+		$params = $dataSetDom->getElementsByTagName("parameter");
+		
+		if ($params->length == 0)
+			$this->throwError("systemError", "Cannot find parameter list for dataset ".$vars['datasetID']); 
+      
+		$paramId = array();
+	  
+		foreach ($params as $p)
+				$paramId[] =  $p->nodeValue;
+ 
+		if (!$vars["sampling"])
+		{ 
+			$sampling = $dataSetDom->getElementsByTagName('min_sampling')->item(0)->nodeValue;
+
+			$units = substr($sampling,-1);
+			$sampling =  substr($sampling,0,strlen($sampling)-1);
+			
+			switch ($units) {        
+// 					case 'S':            
+// 						$sampling = floatval($sampling);
+// 						break; 
+					case 'M':            
+						$sampling = floatval($sampling)*60;
+						break;
+					case 'H':            
+						$sampling = floatval($sampling)*60*60;
+						break;
+					default: 
+			}
+		}
+		else {
+			$sampling = $vars["sampling"];
+		}
+ 
+		if (!$vars["timeFormat"])
+			$timeFormat = "ISO8601";
+		else
+			$timeFormat = $vars["timeFormat"];
+
+		if (!$vars["gzip"])
+			$gzip = 0;
+		else
+			$gzip = $vars["gzip"];
+
+		if (!$vars["stream"])
+			$stream = 0;
+		else
+			$stream = $vars["stream"];
+		
+		$this->service = strtolower(__FUNCTION__);
+
+		$res = $this->doDownloadRequest(
+					array("startTime" => $vars["startTime"], "stopTime" => $vars["stopTime"], "sampling" => $sampling),
+					array("params" => $paramId),
+					array("format" => $vars["outputFormat"], "timeFormat"=> $timeFormat, "gzip"=>$gzip, "stream"=>$stream));
+  
+		if ($res['success']) return $res;
+
+		$this->throwError("serverError", $res['message']); 
+	}
+	
+/*
+*   get status for jobs in batch
+*/
+	public function getStatus($data) 
+	{
+		$result = $this->init($data);
+		
+		$id = $result['vars']['id'];
+		
+		if (!isset($this->requestManager))
+			$this->requestManager = new RequestManagerClass();
+			
+		try 
+		{
+			$res = $this->requestManager->runWSRequest('nobody', 'nobody', FunctionTypeEnumClass::PROCESSGETINFO, null, $id);
+		} 
+		catch (Exception $e) 
+		{
+			// after first getStatus() call  process is deleted
+			$jobsManager = new WSJobsManagerClass();
+			
+			try 
+			{
+				$res = $jobsManager->getResultFromProcessId($id);
+				if (!$res['success']) {
+					$this->throwError("processError","Cannot retrieve process $id info");
+				}
+				
+				$resultTag = $this->isGetPlotRequest($res['result']) ? 'plotURL' : 'dataFileURLs';
+				
+				return  array('success' => true, 'status' => 'done',  $resultTag => WSConfigClass::getUrl().$res['result']);
+			} 
+			catch (Exception $e) 
+			{
+				$this->throwError("getResultFromProcessIdError", "Exception detected : ".$e->getMessage());
+			}
+		}
+		
+		if (!$res['success']) {
+			$this->throwError("processError","Cannot retrieve process $id info");
+		}
+
+		if ($res['status'] == 'in_progress') {
+			return array('success' => true, 'status' => 'in progress');
+		}
+		
+		if ($res['error']) {
+			$this->throwError("processError","Process $id error code");
+		}
+		
+		$this->deleteProcess($res['id']);
+		
+		$resultTag = $this->isGetPlotRequest($res['result']) ? 'plotURL' : 'dataFileURLs';
+		
+		return  array('success' => true, 'status' => $res['status'],  $resultTag => WSConfigClass::getUrl().$res['result']);
+	}
+	
+/*
+*    TODO Can be done by TTCONVERT function of AMDA_Kernel - more hard !!!
+*    TODO Think about this if merge/union will be also done by AMDA_Kernel
+*
+*    get Time Table : shared for impex ; user' for user
+*/
+	public function getTimeTable($data) 
+	{
+		$res = $this->init($data);
+		
+		if (!$res['success']){
+			$this->throwError("requestError", "Cannot parse request"); 
+		}
+		
+		$this->initUserMgr(true);
+		
+		$ttID = $res['vars']['ttID'];
+
+		if ($this->userID == 'impex') {
+			$sharedObjMgr = new SharedObjectsMgr();
+			$ttSrc = $sharedObjMgr->getDataFilePath('timeTable', $ttID);
+		}
+		else
+			$ttSrc = USERTTDIR.$ttID.'.xml';
+
+		if (!file_exists($ttSrc)) {
+			$this->throwError("workspaceError", "No such table ".$ttID." for user ".$this->userID);
+		}
+
+		$ttDst = substr(strtolower(__FUNCTION__), 3)."_".$this->userID."_".$this->requestTime."_$ttID.xml"; 
+
+		//TODO can be done by
+		// $res = $this->requestManager->runWSRequest($this->userID, $this->IPclient,FunctionTypeEnumClass::TTCONVERT, null, $ttID);
+		$this->xsl2vot($ttSrc,$ttDst);
+
+		return array('success' => true, 'ttFileURL' => WSConfigClass::getUrl().$ttDst);
+	}
+
+/*
+*   get Orbits
+*/ 
+	public function getOrbites($data) 
+	{
+		$res = $this->init($data);
+		
+		if (!$res['success']){
+			$this->throwError("requestError", "Cannot parse request"); 
+		}
+		
+		$this->initUserMgr();
+
+		$vars = $res['vars'];
+
+		if (strtotime($vars["stopTime"]) <= strtotime($vars["startTime"])){
+			$this->throwError("requestError", "Requested time interval should be greater than 0");
+		}
+         
+		$spacecraft = $vars["spacecraft"];
+		$coordinateSystem = $vars["coordinateSystem"];
+
+		if (!$vars["units"])
+			$units = "km";
+		else
+			$units = $vars["units"];
+
+		$orbitRequest = array("startTime" => $vars["startTime"],
+				"stopTime"  => $vars["stopTime"],
+				"spacecraft" => $spacecraft,
+				"coordinateSystem" => $coordinateSystem,
+				"units" => $units
+				);
+  
+		$orbitParam = $this->getOrbitParameter($orbitRequest);
+		
+		$paramId = array();
+		array_push($paramId, $orbitParam['parameterID']);
+
+		if (!$vars["timeFormat"])
+			$timeFormat = "ISO8601";
+		else
+			$timeFormat = $vars["timeFormat"];
+
+		if (!$vars["gzip"])
+			$gzip = 0;
+		else
+			$gzip = $vars["gzip"];
+			
+      $this->service = strtolower(__FUNCTION__);
+      
+		$res = $this->doDownloadRequest(
+					array("startTime" => $vars["startTime"], "stopTime" => $vars["stopTime"], "sampling" => $vars["sampling"]),
+					array("params" => $paramId),
+					array("format" => $vars["outputFormat"], "timeFormat"=> $timeFormat, "gzip"=>$gzip, "stream"=>$stream));
+ 	 
+		if ($res['success']) return $res;
+ 
+		$this->throwError("serverError",$res['message']);    
+	}
+
+/*
+*  getPlot : predefined;  by mission
+*/
+	public function getPlot($data) 
+	{
+		$res = $this->init($data);
+		
+		if (!$res['success']){
+			$this->throwError("requestError", "Cannot parse request"); 
+		}
+		
+		$this->initUserMgr();
+		
+		$vars = $res['vars'];
+		$mission = $vars["missionID"];
+		
+		$resultFilePrefix = strtolower(__FUNCTION__)."_".$mission."_".date("YmdHms",strtotime($vars["startTime"]))."_".date("YmdHms",strtotime($vars["stopTime"]));
+		
+		if ($this->userID != "impex") 
+			$resultFilePrefix .= "_".$this->userID;
+
+		$dom = new DomDocument("1.0");
+		if (!@$dom->load(WSConfigClass::getXslDir()."AmdaPlots.xml"))
+			$this->throwError("systemError", "Cannot load predefined plot definition"); ;
+
+		$missionTag = $dom->getElementById($mission);
+		$params = $missionTag->getElementsByTagName('param');
+
+		$paramsList = array();
+		foreach ($params as $param)
+			$paramsList[] = $param->getAttribute('name');
+
+		$requestObject = (Object) array(
+			"nodeType" => "request",
+			"file-format" => "PNG",
+			"result-file" => $resultFilePrefix,
+			"timesrc" => "Interval",
+			"startDate" => $vars["startTime"],
+			"stopDate" => $vars["stopTime"],
+			"parameters" => array()
+		);
+    
+		foreach ($paramsList as $paramToPlot)
+		{
+			$paramObject = (Object) array(
+				"paramid" => $paramToPlot
+			);
+			
+			$requestObject->{"parameters"}[] = $paramObject;
+		}
+
+		$this->service = strtolower(__FUNCTION__);
+		
+		if (!isset($this->requestManager))
+			$this->requestManager = new RequestManagerClass();
+		
+		try {
+			$plotResult = $this->requestManager->runWSRequest($this->userID, $this->IPclient, FunctionTypeEnumClass::PARAMS, $this->service, $requestObject);
+		} catch (Exception $e) {
+				$this->throwError("plotError", "Exeption detected : ".$e->getMessage());
+		}
+		
+		if (!$plotResult['success']) {
+			$this->throwError("serverError", $plotResult['message']);
+		}
+		
+		if($plotResult['status'] == 'in_progress') {
+			return ['success' => true, 'status' => 'in progress', 'id' => $plotResult['id']];
+		} elseif ($plotResult['status'] == 'done') 
+		{
+			$this->deleteProcess($plotResult['id']);
+			return array('success' => true, 'status' => 'done', 'plotFileURL' => WSConfigClass::getUrl().$plotResult['result']);
+		} else {
+			return ['success' => false, 'message' => 'Unknown status ' . $plotResult['status']];
+		} 
+	}
+}
+?>
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<missions>
+	<mission xml:id='ACE'>         
+		<param name='sw_vb'/> 
+		<param name='sw_t'/>	             
+		<param name='sw_n'/>
+		<param name='imf'/> 
+		<param name='imf_mag'/>	  
+	</mission>
+	<mission xml:id='WIND'>
+		<param name='wnd_swe_vmag'/> 	         
+		<param name='wnd_swe_vth'/> 
+		<param name='wnd_swe_n'/> 
+		<param name='wnd_b' class="mag"/> 
+		<param name='wnd_bmag'/>	  
+	</mission> 
+	<mission xml:id='STEREO-A'>
+		<param name='vpbulk_sta'/>
+		<param name='vth_sta'/>
+		<param name='np_sta'/>
+		<param name='sta_b'/>	
+		<param name='sta_btot'/>	 
+	</mission>  
+	<mission xml:id='STEREO-B'>
+		<param name='vpbulk_stb'/>
+		<param name='vth_stb'/>
+		<param name='np_stb'/>
+		<param name='stb_b'/>	
+		<param name='stb_btot'/>	 
+	</mission> 
+	<mission xml:id='VEX'>         
+		<param name='vex_mag_4s'/>
+		<param name='vex_mag_4s_tot'/>
+	</mission>    
+	<mission xml:id='OMNI'>         
+		<param name='omni_sw_v'/>
+		<param name='omni_sw_t'/>
+		<param name='omni_sw_n'/>
+		<param name='omni_imf' />
+		<param name='omni_imf_mag'/>
+	</mission>    
+	<mission xml:id='GEOMAG'>         
+		<param name='omni_kp'/>
+		<param name='omni_dst'/>
+		<param name='omni_ae'/>
+	</mission>    
+</missions> 
+
@@ -0,0 +1,39 @@
+<xsl:stylesheet version="1.0" 
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:output method="xml"/>
+
+<xsl:template match="/timetable">
+ <VOTABLE version='1.1'>
+ <DESCRIPTION>
+        Name: <xsl:value-of select="name"/>;
+        Description: <xsl:value-of select="description"/>; 
+        Historic: <xsl:value-of select="history"/>;
+        Creation Date :  <xsl:value-of select="created"/>; 
+ </DESCRIPTION>
+<RESOURCE>
+<DESCRIPTION>
+        AMDA @ CDPP
+</DESCRIPTION>
+<TABLE>
+<FIELD datatype='char' name='Start Time' ID='TimeIntervalStart' ucd='time.start'>
+    <DESCRIPTION>time tag for beginning of interval</DESCRIPTION>
+</FIELD>
+<FIELD datatype='char' name='Stop Time' ID='TimeIntervalStop' ucd='time.stop'>
+    <DESCRIPTION>time tag for end of interval</DESCRIPTION>
+</FIELD>
+<DATA>
+  <TABLEDATA> 
+  <xsl:for-each select="intervals">
+    <TR>
+       <TD><xsl:value-of select="start"/></TD>
+       <TD><xsl:value-of select="stop"/></TD> 
+    </TR> 
+    </xsl:for-each>
+    </TABLEDATA>
+   </DATA>
+   </TABLE>
+  </RESOURCE>    
+ </VOTABLE>
+</xsl:template>
+</xsl:stylesheet>
@@ -844,9 +844,9 @@ class AmdaAction
     }
 /*
-*   Get Jobs en cours
+*   Get running jobs
 */
-	public  function getJobs()
+	public function getJobs($obj = null)
 	{
 		$obj = (object) array();
 		return $this->executeRequest($obj, FunctionTypeEnumClass::PROCESSRUNNINGINFO);
@@ -863,10 +863,10 @@ class AmdaAction
 			return array('success' => true);
 		}
-		if (isset($obj->username) && isset($obj->password) && isset($obj->sessionID)) {
-			   //$dd = new WSUserMgr();
-            //$dd->init($obj->username,$obj->password,$obj->sessionID);
-			return array('success' => false, "message" => "AKKA-KERNEL-INT - WS support not implemented");
+		if (isset($obj->username) && isset($obj->password) && isset($obj->sessionID))
+		{
+			$dd = new WSUserMgr();
+			$dd->init($obj->username,$obj->password,$obj->sessionID, false);
 		}
 		else {
 			$dd = new UserMgr();
@@ -881,8 +881,11 @@ class AmdaAction
 			return array('success' => false, 'message' => 'ddLogin error: '.$res);
 		}
-		if ($dd->user == 'impex') {	
-			return array('success' => false, "message" => "AKKA-KERNEL-INT - WS support for IMPEx not implemented");
+		if ($dd->user == 'impex')
+		{
+			//if ($dd->getWsSize() > DISK_QUOTA * 100)
+			//	error_log('Natacha! It is time to CLEAN UP IMPEX WS!',1,'nbourrel@irap.omp.eu');
+//			return array('success' => false, "message" => "AKKA-KERNEL-INT - WS support for IMPEx not implemented");
 		}
 		else {
 			// check disk space 
@@ -241,7 +241,8 @@ class RequestMgr extends AmdaObjectMgr
 				if ($obj->timesrc != 'Interval') break;
 				foreach ($obj->list as $param)
-				{							 	 
+				{
+
 					//TODO not in code spase___IMPEX_ !!!
 					//TODO other models (tsyganenko etc)							
 					if (preg_match("#^spase___IMPEX_#", $param->paramid))
@@ -249,14 +250,16 @@ class RequestMgr extends AmdaObjectMgr
 						if ($param->template_args->url_XYZ) $params[] = $param->template_args->url_XYZ;	
 					}
 				}
-				if (!empty($params)) 
+				
+				if (!empty($params))
 				{
+					// tab is not defined, iterate over $obj->tabs?
 					$argsTab['param'] = array_unique($params);
 					$argsTab['startTime'] = $tab->{'multi-plot-linked'} ? $obj->startDate : $tab->startDate;
 					$argsTab['stopTime'] = $tab->{'multi-plot-linked'} ? $obj->startDate : $tab->stopDate;
 				}
 				if (count($argsTab) > 0) $args[] = $argsTab;
-				
+
 				break;
 			case 'statistics' :
 				return array('success' => true);
@@ -264,23 +267,23 @@ class RequestMgr extends AmdaObjectMgr
 			default :
 				return array('success' => false, 'message' => "unknown action ".$obj->nodeType);
 		}
-	
-		if (count($args) === 0) return array('success' => true);				 
-		
+
+		if (count($args) === 0) return array('success' => true);
+
 		try 
 		{
 			$client = new SoapClient(DD_WSDL);
 		}
 		catch  (SoapFault $exception)
-		{			                           
+		{
 			return array('success' => false, 'message' => $exception->faultstring);
 		}
-		
+
 		$orbitsXml = new DomDocument("1.0");
 		$orbitsXml->load(orbitsAllXml);
 		$tr = array('_' => ':');
-		
-		foreach ($args as $tab)
+
+        foreach ($args as $tab)
 		{
 			$startTime = $tab['startTime'];
 			$stopTime = $tab['stopTime'];
@@ -309,8 +312,8 @@ class RequestMgr extends AmdaObjectMgr
 					return array('success' => false, 'message' => "Too big interval for IMPEX request : ".IMPEX_INTERVAL_LIMIT/86400.." day limit!");
 			}
 		}
-		
-		return array('success' => true);
+
+        return array('success' => true);
 	}
 }
 ?>
@@ -542,7 +542,6 @@ unlink(USERWSDIR.&#39;RemoteParams.xml&#39;);
 	public function ddCheckUser() 
 	{
 		$this->IP = $this->getIPclient();
-
 		$cmdCheckUser =  "DDCheckUser ".$this->IP." ".$this->user." 1> /dev/null 2> /dev/null";   
 		system($cmdCheckUser, $res);
 		return $res;
@@ -1,1037 +0,0 @@
-<?php
-/** 
-*   @file WebServer.php
-*   @brief  Web services AMDA
-* 
-*   @version $Id: WebServer.php 2968 2015-06-29 13:17:00Z natacha $ 
-*/
-class WebResultMgr
-{
-  private $resDOM;
-  private $rootEl;
-  private $resXP;
-  private $requestManager = null;
-  private $paramLoader = null;
-
-  function __construct()
-  {
-    if (!is_dir(WSRESULT))
-      mkdir(WSRESULT);
-    chmod(WSRESULT,0775);
-
-    $this->resDOM = new DOMDocument("1.0");
-    $this->resDOM->formatOutput = TRUE;
-    $this->resDOM->preserveWhiteSpace = FALSE;
-    
-    if (!file_exists(wsResultsXml))
-    {
-      $this->rootEl = $this->resDOM->createElement('wsresults');
-      $this->resDOM->appendChild($this->rootEl);
-      $this->resDOM->save(wsResultsXml);
-    }
-    
-    $this->resDOM->load(wsResultsXml);
-    
-    $this->resXP = new DOMXPath($this->resDOM);
-    
-    $this->rootEl = $this->resDOM->documentElement;
-  }
-  
-  public function addResult($function_name,$vars,$user,$IP,$output){
-  	$nodes = $this->rootEl->getElementsByTagName($function_name);
-  	if($nodes->length < 1){
-  		 $funcNode = $this->resDOM->createElement($function_name);
-  		 $this->rootEl->appendChild($funcNode);	 
-  	}
-  	else
-  		$funcNode = $nodes->item(0);
-		  
-   $oldOutput = $this->resXP->query('//'.$function_name.'/result[@output="'.$output.'"]');
-   if ($oldOutput->length > 0)
-     $funcNode->removeChild($oldOutput->item(0));
-   	  
-   $resNode = $this->resDOM->createElement('result');
-   $resNode->setAttribute('date',time());
-   $resNode->setAttribute('user',$user);
-//    $resNode->setAttribute('IP',$IP);
-   $resNode->setAttribute('input',json_encode($vars));
-   $resNode->setAttribute('output',$output);
-   $funcNode->appendChild($resNode);
-   
-   $this->resDOM->save(wsResultsXml);
-   
-   return $resNode;
-  }
-  
-  public function getResOutputName($function_name,$user,$suffixe,$extension)
-  {
-    $outputFile = WSRESULT.$function_name."_".$user;
-    if (isset($suffixe))
-      $outputFile .= ("_".$suffixe);
-    if (isset($extension))
-      $outputFile .= (".".$extension);
-    else
-      $outputFile .= ".xml";
-    return $outputFile;
-  }
-}
-
-class WebServer
-{
-  private $isSoap = false;
-  private $userID, $userPWD, $sessionID;
-  private $wsUserMgr;
-  private $resultMgr, $myParamsInfoMgr;
-  private $dataFileName;
-
-  function __construct() {
-    $this->userID  = 'impex';
-    $this->userPWD = 'impexfp7';
-    $this->sessionID = $this->userID;
-    $this->myParamsInfoMgr =  new ParamsInfoMgr();
-    $this->resultMgr = new WebResultMgr();
-  }
- 
-  protected function init($data) {
-    if(is_object($data))
-    {
-      $vars = get_object_vars($data);
-      $this->isSoap = true; 
-    }
-    else
-      $vars = $data;
-
-    if (isset($vars['userID']))
-    {
-      $this->userID  = $vars['userID'];
-      $this->sessionID = $this->userID;
-    }
-    else {
-      $this->userID  = 'impex';
-      $this->sessionID = $this->userID;
-    }
-    if (isset($vars['password']))
-      $this->userPWD = $vars['password'];
-    else 
-      $this->userPWD = 'impexfp7';
-    return array('success' => true, 'vars' => $vars);
-  }
-
-  private function setID(){
-
-                   $nb_min = 10000;
-                   $nb_max = 99999;
-                   $nombre = mt_rand($nb_min,$nb_max);
-
-		   $this->IP = $this->getIPclient();
-
-              return "PP".$nombre;
-           }
-
-/**
- *  Function getIPclient return the IP client sent a request for needs DD scripts (DDHtmlLogin, DDCheckUser, DD_Search)
- *
- *       @param   void
- *       @return  string  
- */
-           private  function getIPclient(){
- 
-             if (getenv('REMOTE_ADDR'))  {
-                     $realIP = getenv('REMOTE_ADDR');
-             }
-             else {
-                         //get local IP
-                      $command="hostname -i";
-                      $realIP = exec($command);
-             }
- 
-           return $realIP;
-           }
-
-  private function timeInterval2Days($TimeInterval){
-
-        $divDays = 60*60*24;
-        $nbDays = floor($TimeInterval / $divDays);
-        $divHours = 60*60;
-        $nbHours = floor(($TimeInterval - $divDays*$nbDays)/$divHours);
-        $nbMin = floor(($TimeInterval - $divDays*$nbDays - $divHours*$nbHours)/60);
-        $nbSec = $TimeInterval - $divDays*$nbDays - $divHours*$nbHours - $nbMin*60;
-
-        $DD = sprintf("%03d",   $nbDays);                       // format ex. 005 not 5
-        $HH = sprintf("%02d",   $nbHours);                      // format ex. 25 
-        $MM = sprintf("%02d",   $nbMin);                        // format ex. 03 not 3
-        $SS = sprintf("%02d",   $nbSec);                        // format ex. 02 not 2
-
-        return  $DD.':'.$HH.':'.$MM.':'.$SS;
-
-    }
-
-/* Start Time into AMDA format YYYY:DOY-1:HH:MM:SS */
-    private function startTime2Days($startTime){
-
-         $ddStart = getdate($startTime);
-         $date_start = sprintf("%04d",$ddStart["year"]).":".sprintf("%03d", $ddStart["yday"]).":"
-                                   .sprintf("%02d",$ddStart["hours"]).":".sprintf("%02d",$ddStart["minutes"]).":"
-                                   .sprintf("%02d",$ddStart["seconds"]);
-        return $date_start;
-    }
-
-   private function rrmdir($dir){
-      if (is_dir($dir)) {
-        $objects = scandir($dir);
-
-        foreach ($objects as $object) { // Recursively delete a directory that is not empty and directorys in directory 
-          if ($object != "." && $object != "..") {  // If object isn't a directory recall recursively this function 
-            if (filetype($dir."/".$object) == "dir")
-                     $this->rrmdir($dir."/".$object);
-            else
-                    unlink($dir."/".$object);
-          }
-        }
-        reset($objects);
-        rmdir($dir);
-      }
-    }
-
-  protected function initUserMgr() {
-    if (isset($this->wsUserMgr))
-      return array('success' => true);
-      $this->wsUserMgr = new WSUserMgr();
-      $this->wsUserMgr->init($this->userID,$this->userPWD,$this->sessionID, $this->isSoap);
-    
-    return array('success' => true);
- }
-
-  public function getTimeTablesList($data) {
-    if(is_object($data))
-    {
-      $vars = get_object_vars($data);
-      $this->isSoap = true; 
-    }
-    else
-      $vars = $data;
-    if (isset($vars['userID']) && $vars['userID'] == 'impex'){
-	if ($this->isSoap) throw new SoapFault("server00","Server Error: AMDA Login procedure failed"); 
-	else return array("error" => "Server Error: AMDA Login procedure failed");
-    }
-     
-     
-    $res = $this->init($data);
-    $vars = $res['vars'];
-
-    $ttListWSresult = $this->resultMgr->getResOutputName(__FUNCTION__,$this->userID);
-    
-    $dom = new DOMDocument("1.0");
-    if ($this->userID == 'impex') {
-    	$sharedObjMgr = new SharedObjectsMgr();
-    	$loadDom = $dom->load($sharedObjMgr->getTreeFilePath());
-    }
-    else
-      $loadDom = $dom->load(USERPATH.$this->userID.'/WS/Tt.xml');
-    
-    if ($loadDom == FALSE){
-	if ($this->isSoap) throw new SoapFault("server00","Server Error: AMDA Login procedure failed"); 
-	else return array("error" => "Server Error: AMDA Login procedure failed");
-    }
-    
-    $timetabNode = $dom->documentElement->getElementsByTagName('timetabList');
-
-    if ($timetabNode->length < 1){
-       if ($this->isSoap)  throw new SoapFault("server03","Cannot reach TT list"); 
-      else return array('success' => false, 'message' => "Server Error: Cannot reach TT list");
-    }
-    $outDOM = new DOMDocument("1.0");
-    $outDOM->formatOutput = TRUE;
-    $outDOM->preserveWhiteSpace = FALSE;
-    
-    $newNode = $outDOM->importNode($timetabNode->item(0),TRUE);
-    $outDOM->appendChild($newNode);
-    
-
-    $outXP = new domxpath($outDOM);
-    $ttNodes = $outXP->query('//timetab');
-
-    $outDOM->save($ttListWSresult);
-
-    $wsres = $this->resultMgr->addResult(__FUNCTION__,$vars,$this->userID,$ttListWSresult);
-
-    $ttListResult = 'http://'.str_replace(BASE_PATH,$_SERVER['SERVER_NAME'].APACHE_ALIAS,$ttListWSresult);
-
-    $timeTablesList = array('success' => true, 'TimeTablesList' => $ttListResult);
-
-    return $timeTablesList;
-
-  }
-
-  public function getTimeTable($data) {
-    $res = $this->init($data);
-
-    $vars = $res['vars'];
-    $ttID = $vars['ttID'];
-
-    if ($this->userID == 'impex') {
-    	$sharedObjMgr = new SharedObjectsMgr();
-    	$ttSrc = $sharedObjMgr->getDataFilePath('timeTable', $ttID);
-    }
-    else
-      $ttSrc = USERPATH.$this->userID.'/TT/'.$ttID.'.xml';
-
-    if (!file_exists($ttSrc)) {
-      if ($this->isSoap)  throw new SoapFault("server03","Cannot reach time table"); 
-      else return array('success' => false, 'message' => "Cannot reach time table");      
-    }
-
-    $ttWSresult = $this->resultMgr->getResOutputName(__FUNCTION__,$this->userID,$ttID);
-
-    if (!copy($ttSrc,$ttWSresult)){
-      if ($this->isSoap)  throw new SoapFault("server04","Cannot copy time table"); 
-      else return array('success' => false, 'message' => "Cannot copy time table");        
-    }
-    
-    $wsres = $this->resultMgr->addResult(__FUNCTION__,$vars,$this->userID, $ttWSresult);
-    
-    $myTimeTableMgr = new TimeTableMgr($this->userID);
-    $ttWSresultVot = $myTimeTableMgr->xsl2vot($ttWSresult);
-    if( file_exists ( $ttWSresultVot)){
-      copy($ttWSresultVot, $ttWSresult);
-      unlink( $ttWSresultVot ) ;
-    }
-    return array('success' => true, 'ttFileURL' => 'http://'.str_replace(BASE_PATH,$_SERVER['SERVER_NAME'].APACHE_ALIAS,$ttWSresult));
-
-  }
-  
-  
-  public function isAlive(){
-    $res = $this->init($data);
-    return true;
-  }
-  
-
- public function getObsDataTree() {
-         
-    $res = $this->init();
-    
-    $resMgr = $this->initUserMgr(); 
-
-    $vars = $res['vars'];
-
-    $locParamSrc = USERPATH.$this->userID.'/WS/LocalParams.xml'; 
-//     $remoteParamSrc = USERPATH.$this->userID.'/WS/RemoteParams.xml';
-    $wsParamSrc = USERPATH.$this->userID.'/WS/WsParams.xml';
-    $locParamResult = $this->resultMgr->getResOutputName(__FUNCTION__,$this->userID.'_'.'LocalParams');
-//     $remoteParamResult = $this->resultMgr->getResOutputName(__FUNCTION__,'RemoteParams');
-    $wsParamResult = $this->resultMgr->getResOutputName(__FUNCTION__,$this->userID.'_'.'WsParams');
-
-    if (!copy($locParamSrc,$locParamResult))
-	$locParamResult = '';  
-    else {
-	$piBase = new DomDocument("1.0");
-	$piBase->formatOutput = true;
-	$piBase->preserveWhiteSpace = false;
-	
-	$dom = new DomDocument("1.0");
-        $dom->load($locParamResult);
-            
-	$xsl = new DomDocument("1.0");
-	$xsl->load(XMLPATH.'dd2WStree.xsl');
-	
-	$xslt = new XSLTProcessor();
-	$xslt->importStylesheet($xsl);
-	  
-	$dom->loadXML($xslt->transformToXML($dom));
-	
-	$dom->formatOutput = true;
-	$dom->preserveWhiteSpace = false;  
-	$chum_ger = $dom->getElementById("Rosetta@C-G : Plot Only!");
-	if ($chum_ger != NULL) $chum_ger->setAttribute("target","Churyumov-Gerasimenko");
-	
-	$dom->save($locParamResult);
-    }
-//     if (!copy($remoteParamSrc,$remoteParamResult))
-// 	$remoteParamResult = '';  
-    if (!copy($wsParamSrc,$wsParamResult))
-	$wsParamResult = '';  
- 
-    if ($locParamResult !='') $locParamResult = 'http://'.str_replace(BASE_PATH,$_SERVER['SERVER_NAME'].APACHE_ALIAS,$locParamResult);
-//     if ($remoteParamResult !='') $remoteParamResult = 'http://'.str_replace(BASE_PATH,$_SERVER['SERVER_NAME'].APACHE_ALIAS,$remoteParamResult);
-    if ($wsParamResult !='') $wsParamResult = 'http://'.str_replace(BASE_PATH,$_SERVER['SERVER_NAME'].APACHE_ALIAS,$wsParamResult);
-
-  if (($locParamResult =='') && ($remoteParamResult =='') && ($wsParamResult =='')){
-     if ($this->isSoap)  throw new SoapFault("server05","No params descriptions .xml files for ".$this->userID." user"); 
-      else return array('success' => false, 'message' => "No params descriptions .xml files for ".$this->userID." user");
-    } 
-
-    $wsres = $this->resultMgr->addResult(__FUNCTION__,$vars,$this->userID,$wsParamResult.";".$locParamResult.";".$remoteParamResult);
-
-    return  array('success' => true,'WorkSpace' => array("LocalDataBaseParameters"=>$locParamResult, "RemoteDataBaseParameters"=>$remoteParamResult));
-  }
-
-  public function getPlot($data) {
-
-    $res = $this->init($data);
-    $resMgr = $this->initUserMgr();
-    
-    $vars = $res['vars'];
-    $mission = $vars["missionID"];
-
-    $ID = $this->setID();  // unique JobID
-    $resDirName = WSRESULT.$ID; // Define a temporary  directory for results
-
-    if (is_dir($resDirName))
-          $this->rrmdir($resDirName);
-    mkdir($resDirName);
-    chmod($resDirName,0775);
-
-    $dom = new DomDocument("1.0");
-    $dom->load(plotsXml);
-
-    $missionTag = $dom->getElementById($mission);
-    $params = $missionTag->getElementsByTagName('param');
-
-    $paramsList = array();
-    foreach ($params as $param)
-    	$paramsList[] = $param->getAttribute('name');
-
-    $requestObject = (Object) array(
-    	"nodeType" => "request",
-    	"file-format" => "PNG",
-    	"file-output" => "WS",
-    	"ws-result-file" => $resDirName."/request.list.png",
-    	"last-plotted-tab" => 1,
-    	"timesrc" => "Interval",
-    	"startDate" => $vars["startTime"],
-    	"stopDate" => $vars["stopTime"],
-    	"tabs" => array()
-    );
-    
-    $pageObject = (Object) array(
-    	"id" => 1,
-    	"multi-plot-linked" => true,
-    	"page-margins-activated" => true,
-    	"page-margin-x" => 5,
-    	"page-margin-y" => 5,
-    	"page-orientation" => "portrait",
-    	"page-dimension" => "ISO A4",
-    	"page-layout-type" => "vertical",
-    	"page-layout-object" => (Object) array(
-    		"layout-panel-height" => 0.25,
-    		"layout-panel-spacing" => 0,
-    		"layout-expand" => false
-    	),
-    	"panels" => array()
-    );
-    
-    foreach ($paramsList as $paramToPlot)
-    {
-    	$panelObject = (Object) array(
-    		"panel-plot-type" => "timePlot",
-    		"axes" => array(),
-    		"params" => array()
-    	);
-    	
-    	$timeAxisObject = (Object) array(
-    		"id" => "time",
-    		"axis-type" => "time",
-   			"axis-range-extend" => true
-    	);
-    	$panelObject->{"axes"}[] = $timeAxisObject;
-
-    	$yAxisObject = (Object) array(
-    		"id" => "y-left",
-    		"axis-type" => "y-left",
-   			"axis-range-extend" => true
-    	);
-    	$panelObject->{"axes"}[] = $yAxisObject;
-    	
-    	$paramObject = (Object) array(
-    		"id" => 1,
-    		"param-id" => $paramToPlot,
-    		"param-drawing-type" => "serie",
-    		"param-drawing-object" => (Object) array(
-    			"serie-yaxis" => "y-left",
-    			"serie-lines-activated" => true
-    		)
-    	);
-    	$panelObject->{"params"}[] = $paramObject;
-    	
-    	$pageObject->{"panels"}[] = $panelObject;
-    }
-    
-    $requestObject->{"tabs"}[] = $pageObject;
-    
-    require_once(INTEGRATION_SRC_DIR."RequestManager.php");
-    if (!isset($this->requestManager))
-    	$this->requestManager = new RequestManagerClass();
-     
-    try {
-    	$plotResult = $this->requestManager->runIHMRequest($this->userID, $this->getIPclient(), FunctionTypeEnumClass::PARAMS, $requestObject);
-    } catch (Exception $e) {
-    	if ($this->isSoap)  throw new SoapFault("plot01", 'Exception detected : '.$e->getMessage());
-    	else return array('success' => false, 'message' => 'Exception detected : '.$e->getMessage());
-    }
-
-    return array('success' => true, 'plotDirectoryURL' => $ID);
-  }
-
-  public function getResultPlot($data) {
-      
-    $res = $this->init($data);
-    $vars = $res['vars'];
-    $ID = $vars["plotDirectoryURL"];
-    $filename = WSRESULT.$ID."/request.list.png";
-    if (file_exists($filename)) {
-	$plotWSresult=WSRESULT.$ID."/request.list.png";
-        return array('success' => true, 'plotFileURL' => 'http://'.str_replace(BASE_PATH,$_SERVER['SERVER_NAME'].APACHE_ALIAS,$plotWSresult));
-    }
-    else
-	return array('success' => false);
-
-  }
-
-
-  public function getParameterList($data) {
-         
-    $res = $this->init($data);
-    
-    $resMgr = $this->initUserMgr(); 
-
-    $vars = $res['vars'];
-
-    $locParamSrc = USERPATH.$this->userID.'/WS/LocalParams.xml'; 
-//     $remoteParamSrc = USERPATH.$this->userID.'/WS/RemoteParams.xml';
-    $wsParamSrc = USERPATH.$this->userID.'/WS/WsParams.xml';
-    $locParamResult = $this->resultMgr->getResOutputName(__FUNCTION__,$this->userID.'_'.'LocalParams');
-//     $remoteParamResult = $this->resultMgr->getResOutputName(__FUNCTION__,'RemoteParams');
-    $wsParamResult = $this->resultMgr->getResOutputName(__FUNCTION__,$this->userID.'_'.'WsParams');
-
-    if (!copy($locParamSrc,$locParamResult))
-	$locParamResult = '';  
-    else {
-	$piBase = new DomDocument("1.0");
-	$piBase->formatOutput = true;
-	$piBase->preserveWhiteSpace = false;
-	
-	$dom = new DomDocument("1.0");
-        $dom->load($locParamResult);
-            
-	$xsl = new DomDocument("1.0");
-	$xsl->load(XMLPATH.'dd2WStree.xsl');
-	
-	$xslt = new XSLTProcessor();
-	$xslt->importStylesheet($xsl);
-	  
-	$dom->loadXML($xslt->transformToXML($dom));
-	
-	$dom->formatOutput = true;
-	$dom->preserveWhiteSpace = false;  
-	$chum_ger = $dom->getElementById("Rosetta@C-G : Plot Only!");
-	if ($chum_ger != NULL) $chum_ger->setAttribute("target","Churyumov-Gerasimenko");
-	$dom->save($locParamResult);
-    }
-//     if (!copy($remoteParamSrc,$remoteParamResult))
-// 	$remoteParamResult = '';  
-    if (!copy($wsParamSrc,$wsParamResult))
-	$wsParamResult = '';  
- 
-    if ($locParamResult !='') $locParamResult = 'http://'.str_replace(BASE_PATH,$_SERVER['SERVER_NAME'].APACHE_ALIAS,$locParamResult);
-//     if ($remoteParamResult !='') $remoteParamResult = 'http://'.str_replace(BASE_PATH,$_SERVER['SERVER_NAME'].APACHE_ALIAS,$remoteParamResult);
-    if ($wsParamResult !='') $wsParamResult = 'http://'.str_replace(BASE_PATH,$_SERVER['SERVER_NAME'].APACHE_ALIAS,$wsParamResult);
-
-  if (($locParamResult =='') && ($remoteParamResult =='') && ($wsParamResult =='')){
-     if ($this->isSoap)  throw new SoapFault("server05","No params descriptions .xml files for ".$this->userID." user"); 
-      else return array('success' => false, 'message' => "No params descriptions .xml files for ".$this->userID." user");
-    } 
-
-    $wsres = $this->resultMgr->addResult(__FUNCTION__,$vars,$this->userID,$wsParamResult.";".$locParamResult.";".$remoteParamResult);
-
-    return  array('success' => true,'ParameterList' => array("UserDefinedParameters"=>$wsParamResult, "LocalDataBaseParameters"=>$locParamResult, "RemoteDataBaseParameters"=>$remoteParamResult));
-  }
-///////////////////////////////////////START GET DATASET   ///////////////////////////////
-  public function getParameter($data) {
-
-    $multiParam = false;
-
-    $res = $this->init($data);
-    
-    $resMgr = $this->initUserMgr();
-
-    if (!$res['success']){
-     if ($this->isSoap)  throw new SoapFault("server01","Cannot init user manager"); 
-      else return array('success' => false, 'message' => "Cannot init user manager");
-    }
-
-    $vars = $res['vars'];
-
-    if ((strtotime($vars["stopTime"]) - strtotime($vars["startTime"])) < 0){
-      if ($this->isSoap)  throw new SoapFault("request01","Start time must be higher than stop time"); 
-      else return array('success' => false, 'message' => "Start time must be higher than stop time");
-    }
-    elseif ((strtotime($vars["stopTime"]) - strtotime($vars["startTime"])) == 0){
-      if ($this->isSoap)  throw new SoapFault("request02","You time interval equal 0 start is ".$vars["stopTime"]." stop is ".$vars["startTime"]); 
-      else return array('success' => false, 'message' => "You time interval equal 0");
-    }
- 
-    $dataFileName = $this->getDataFileName($vars, $multiParam);
-
-    if ($dataFileName['success']) $this->dataFileName = $dataFileName['fileName'];
-    else {
-      if ($this->isSoap)  throw new SoapFault("request03",$dataFileName['message']); 
-      else return array('success' => false, 'message' => $dataFileName['message']);
-    }
-
-
-    $paramId = array();
-    array_push($paramId, $vars["parameterID"]);
-//     $paramId[] = $vars["parameterID"];
-
-    if (!$vars["timeFormat"])
-      $timeFormat = "ISO8601";
-    else
-      $timeFormat = $vars["timeFormat"];
-
-    if (!$vars["gzip"])
-      $gzip = 0;
-    else
-      $gzip = $vars["gzip"];
-/*
-    if (!$vars["stream"])
-      $stream = 0;
-    else
-      $stream = $vars["stream"];*/
-
-    $res = $this->doDownloadRequest(
-  	          array("startTime" => $vars["startTime"], "stopTime" => $vars["stopTime"], "sampling" => $vars["sampling"]),
-  	          array("params" => $paramId),
-  	          array("userName" => $this->userID, "userPwd" => $this->userPWD, "sessionID" => $this->sessionID),
-  	          array("format" => $vars["outputFormat"], "timeFormat"=> $timeFormat, "gzip"=>$gzip, "stream"=>$stream),
-		  $dataFileName);
-
- 	 
-    if ($res['success']) return $res;
-    else {
-      if ($this->isSoap)  throw new SoapFault("request03",$res['message']); 
-      else return array('success' => false, 'message' => $res['message']);
-    }
-  }
-///////////////////////////////////////START GET ORBITES   ///////////////////////////////
-  public function getOrbites($data) {
-
-    $multiParam = false;
-
-    $res = $this->init($data);
-
-   $resMgr = $this->initUserMgr();
-
-    if (!$resMgr['success']){
-     if ($this->isSoap)  throw new SoapFault("server01","Cannot init user manager"); 
-      else return array('success' => false, 'message' => "Cannot init user manager");
-    }
-
-    $vars = $res['vars'];
-
-    if ((strtotime($vars["stopTime"]) - strtotime($vars["startTime"])) < 0){
-      if ($this->isSoap)  throw new SoapFault("request01","Start time must be higher than stop time"); 
-      else return array('success' => false, 'message' => "Start time must be higher than stop time");
-    }
-    elseif ((strtotime($vars["stopTime"]) - strtotime($vars["startTime"])) == 0){
-      if ($this->isSoap)  throw new SoapFault("request02","You time interval equal 0 start is ".$vars["stopTime"]." stop is ".$vars["startTime"]); 
-      else return array('success' => false, 'message' => "You time interval equal 0");
-    }
- 
-    
-    
-    $spacecraft = $vars["spacecraft"];
-    $coordinateSystem = $vars["coordinateSystem"];
-    if ($spacecraft == "GALILEO") $spacecraft = ucfirst(strtolower($spacecraft));
-    if (!$vars["units"])
-      $units = "km";
-    else
-      $units = $vars["units"];
-
-    $paramId = array();
-
-    $orbitRequest = array("startTime" 		=> $vars["startTime"],
-			  "stopTime"  		=> $vars["stopTime"],
-			  "spacecraft"		=> $spacecraft,
-			  "coordinateSystem"	=> $coordinateSystem,
-			  "units"		=> $units
-			 );
-			 
-			 
-    $orbitesParam = $this->getOrbitesParameter($orbitRequest);
-    if ($orbitesParam['success']) $orbParam = $orbitesParam['parameterID'];
-      else {
-      $orbParam = 'successEstfalse';
-      if ($this->isSoap)  throw new SoapFault("request03",$orbitesParam['message']); 
-      else return array('success' => false, 'message' => $orbitesParam['message']);
-    }
-
-     
-     $dataFileName = $this->getDataFileName($orbitesParam, $multiParam);
-
-    if ($dataFileName['success']) $this->dataFileName = $dataFileName['fileName'];
-    else {
-      if ($this->isSoap)  throw new SoapFault("request03",$dataFileName['message']); 
-      else return array('success' => false, 'message' => $dataFileName['message']);
-    }
-    
-    array_push($paramId, $orbParam);
-//     $paramId[] = $vars["parameterID"];
-
-    if (!$vars["timeFormat"])
-      $timeFormat = "ISO8601";
-    else
-      $timeFormat = $vars["timeFormat"];
-
-    if (!$vars["gzip"])
-      $gzip = 0;
-    else
-      $gzip = $vars["gzip"];
-      
-    $res = $this->doDownloadRequest(
-  	          array("startTime" => $vars["startTime"], "stopTime" => $vars["stopTime"], "sampling" => $vars["sampling"]),
-  	          array("params" => $paramId),
-  	          array("userName" => $this->userID, "userPwd" => $this->userPWD, "sessionID" => $this->sessionID),
-  	          array("format" => $vars["outputFormat"], "timeFormat"=> $timeFormat, "gzip"=>$gzip, "stream"=>$stream),
-		  $dataFileName);
-
- 	 
-    if ($res['success']) return $res;
-    else {
-      if ($this->isSoap)  throw new SoapFault("request03",$res['message']); 
-      else return array('success' => false, 'message' => $res['message']);
-    }
-  }
-  
-///////////////////////////////////////START GET DATASET   ///////////////////////////////
-
-
-  public function getDataset($data) {
-    $multiParam = true;
-
-    $res = $this->init($data);
-    
-    $resMgr = $this->initUserMgr();
-
-    $vars = $res['vars'];
-
-    if ((strtotime($vars["stopTime"]) - strtotime($vars["startTime"])) < 0){
-      if ($this->isSoap)  throw new SoapFault("request01","Start time must be higher than stop time"); 
-      else return array('success' => false, 'message' => "Start time must be higher than stop time");
-    }
-    elseif ((strtotime($vars["stopTime"]) - strtotime($vars["startTime"])) == 0){
-      if ($this->isSoap)  throw new SoapFault("request02","You time interval equal 0"); 
-      else return array('success' => false, 'message' => "You time interval equal 0");
-    }
- 
-    $dataFileName = $this->getDataFileName($vars, $multiParam);
-
-    if ($dataFileName['success']) $this->dataFileName = $dataFileName['fileName'];
-    else {
-      if ($this->isSoap)  throw new SoapFault("request03",$dataFileName['message']); 
-      else return array('success' => false, 'message' => $dataFileName['message']);
-    }
-    $paramId = array();
-    $localData = simplexml_load_file(USERPATH.$this->userID.'/WS/LocalParams.xml');
- 
-    if (!$vars["sampling"]){
-$xpath = "//dataset[@xml:id='".$vars['datasetID']."']/@sampling";
-$tmp = $localData->xpath($xpath);
-$vars["sampling"] = (string)$tmp[0];     
-
-$matches=array();
-preg_match("/([a-z])$/", $vars["sampling"], $matches);
-
-
-$dataFileName = $this->getDataFileName($vars, $multiParam);
-
-if ($dataFileName['success']) $this->dataFileName = $dataFileName['fileName'];
-else {
-  if ($this->isSoap)  throw new SoapFault("request03",$dataFileName['message']); 
-  else return array('success' => false, 'message' => $dataFileName['message']);
-}
-
-$vars["sampling"] = strtr($vars["sampling"], array($matches[1] => ""));
-       switch ($matches[1]) {        
-            case 's':            
-             $sampling = floatval($vars["sampling"]);
-             break; 
-            case 'm':            
-             $sampling = floatval($vars["sampling"])*60;
-             break;
-            case 'h':            
-             $sampling = floatval($vars["sampling"])*60*60;
-            break;
-            default: 
-  }
-     }
-
-    $xpath = "//dataset[@xml:id='".$vars['datasetID']."']/parameter/@*[namespace-uri()='http://www.w3.org/XML/1998/namespace' and local-name()='id']";
-    $pars = $localData->xpath($xpath);
-
-    foreach ($pars as $p)
-  $paramId[] = (string)$p[0];
- 
-    if (!$vars["timeFormat"])
-      $timeFormat = "ISO8601";
-    else
-      $timeFormat = $vars["timeFormat"];
-
-    if (!$vars["gzip"])
-      $gzip = 0;
-    else
-      $gzip = $vars["gzip"];
-
-    $res = $this->doDownloadRequest(
-            array("startTime" => $vars["startTime"], "stopTime" => $vars["stopTime"], "sampling" => $sampling),
-            array("params" => $paramId),
-            array("userName" => $this->userID, "userPwd" => $this->userPWD, "sessionID" => $this->sessionID),
-            array("format" => $vars["outputFormat"], "timeFormat"=> $timeFormat, "gzip"=>$gzip, "stream"=>$stream),
-  $dataFileName);
-
-  
-    if ($res['success']) return $res;
-    else {
-      if ($this->isSoap)  throw new SoapFault("request03",$res['message']); 
-      else return array('success' => false, 'message' => $res['message']);
-    }
-  }
-
-////////////////////////////////////////END GET PARAMETERS  /////////////////////////////////
-  protected function getOrbitesParameter($orbitRequest) {
-
-    $orbitesXml = new DomDocument();
-	    
-    if (file_exists(orbitesXml)) {
-      $orbitesXml -> load(orbitesXml);
-      $xpath = new DOMXpath($orbitesXml);
-      $path = '//orbites[@mission="'.$orbitRequest['spacecraft'].'" and @coordinate_system="'.$orbitRequest['coordinateSystem'].'" and @units="'.$orbitRequest['units'].'" ] ';
-
-      $orbites = $xpath->query($path);
-      foreach ($orbites as $orbite){
-	$paramInfo = $this->myParamsInfoMgr->GetDDInfoFromParameterID($orbite->getAttribute('xml:id'));  
-        $paramStart = $paramInfo['dataset']['starttime'];
-        $paramStop = $paramInfo['dataset']['stoptime'];
-
-        if((strtotime($paramStart) <= strtotime($orbitRequest['startTime']) && (strtotime($orbitRequest['stopTime'])) <= strtotime($paramStop))) { 
-
-       return array('success' => true, 
-        'parameterID' => $orbite->getAttribute('xml:id'),
-        'startTime'   => $orbitRequest['startTime'],
-        'stopTime'    => $orbitRequest['stopTime']        
-        );
-        }
-      }
-      return array('success' => false, 
-      'message' => 
-      "Cannot find orbites for ".$orbitRequest['spacecraft']." between ".$orbitRequest['startTime']." in ".$orbitRequest['units']."  ".$orbitRequest['coordinateSystem']." and ".$orbitRequest['stopTime']." ($paramStart  - $paramStop) ");
-    }
-    else {
-	return array('success' => false, 'message' => "Orbits file doesn't exist"); 
-    }	
-  }
-
-
-  protected function doDownloadRequest($interval,$paramList,$user,$formatInfo,$dataFileName) {
-  	if ($interval['sampling'])
-  		$structure = 0;// sampling
-  	else
-  		$structure = 2;   // not sampling
-  	
-  	$fileExtension = "";
-  	switch ($formatInfo['format'])
-  	{
-  		case 'netCDF' :
-  			if (!$jobMgr){
-  				if ($this->isSoap)  throw new SoapFault("server01","netCDF format not implemented");
-  				else return array('success' => false, 'message' => "netCDF format not implemented");
-  			}
-  			break;
-  		case 'VOTable' :
-  			$fileformat = "vot";
-  			$kernelExtension = ".vot";
-  			$wsExtension = ".xml";
-  			break;
-  		case 'ASCII' :
-  		default :
-  			$fileformat = "ASCII";
-  			$kernelExtension = ".txt";
-  			$wsExtension = ".txt";
-  	}
-  	
-  	switch ($formatInfo['timeFormat'])
-  	{
-  		case 'unixtime' :
-  			$timeformat = 'Timestamp';
-  			break;
-  		default :
-  			$timeformat = 'YYYY-MM-DDThh:mm:ss';
-  	}
-  	
-  	if ($formatInfo['gzip'] == 1)
-  	{
-  		$compression = "gzip";
-  		$kernelExtension .= ".gz";
-  		$wsExtension .= ".gz";
-  	}
-  	else
-  		$compression = "";
-  	
-  	require_once(INTEGRATION_SRC_DIR."RequestManager.php");
-  	IHMConfigClass::setUserName($this->userID);
-  	if (!isset($this->paramLoader))
-  		 $this->paramLoader = new IHMUserParamLoaderClass();
-
-  	//Build parameter list
-  	$params = array();
-  	
-  	//TODO template arguments to implementer ?
-  	foreach ($paramList['params'] as $paramId)
-  	{
-		$param = new stdClass;
-		
-  		if (preg_match("#^ws_#",$paramId))
-  		{
-  			$res = $this->paramLoader->getDerivedParameterNameFromId($paramId);
-  			if (!$res["success"])
-  			{
-  				if ($this->isSoap)  throw new SoapFault("server02", 'Not available derived parameter '.$paramId);
-  				else return array('success' => false, 'message' => 'Not available derived parameter '.$paramId);
-  			}
-  			$param->paramid = "ws_".$res['name'];
-  		}
-  		else if (preg_match("#^wsd_#",$paramId))
-  		{
-  			$res = $this->paramLoader->getUploadedParameterNameFromId($paramId);
-  			if (!$res["success"])
-  			{
-  				if ($this->isSoap)  throw new SoapFault("server02", 'Not available user parameter '.$paramId);
-  				else return array('success' => false, 'message' => 'Not available user parameter '.$paramId);
-  			}
-  			$param->paramid = "wsd_".$res['name'];
-  		}
-  		else
-  		{
-  			$param->paramid = $paramId;
-		}
-		
-		$params[] = $param;
-  	}
-  	
-  	$obj = (object)array(
-  			"nodeType"         => "download",
-  			"downloadSrc"      => "0",
-  			"structure"        => $structure,
-  			"refparamSampling" => false,
-  			"sampling"         => $interval['sampling'],
-  			"timesrc"          => "Interval",
-  			"startDate"        => $interval['startTime'],
-  			"stopDate"         => $interval['stopTime'],
-  			"list"             => $params,
-  			"fileformat"       => $fileformat,
-  			"timeformat"       => $timeformat,
-  			"compression"      => $compression,
-  			"disablebatch"     => true
-  	);
-  	
-  	if (!isset($this->requestManager))
-  		$this->requestManager = new RequestManagerClass();
-  	
-  	try {
-  		$downloadResult = $this->requestManager->runIHMRequest($this->userID, $this->getIPclient(), FunctionTypeEnumClass::PARAMS, $obj);
-  	} catch (Exception $e) {
-  		if ($this->isSoap)  throw new SoapFault("server02", 'Exception detected : '.$e->getMessage());
-  		else return array('success' => false, 'message' => 'Exception detected : '.$e->getMessage());
-  	}
-  	  	
-  	if (!$downloadResult['success'])
-  	{
-  		if ($this->isSoap)  throw new SoapFault("server03", $downloadResult['message']);
-  		else return array('success' => false, 'message' => $downloadResult['message']);
-  	}
-  	
-  	$resultFile = USERPATH.$this->userID.'/RES/'.$downloadResult['folder'].'/'.$downloadResult['result'];
-  	$resultFile .= $kernelExtension;
-  	
-  	if (!file_exists($resultFile))
-  	{
-  		if ($this->isSoap)  throw new SoapFault("server04", 'Cannot retrieve result file '.$resultFile);
-  		else return array('success' => false, 'message' => 'Cannot retrieve result file');
-  	}
-  	
-  	rename($resultFile, WSRESULT.$this->dataFileName.$wsExtension);
-  	$outputFile = WSRESULT.$this->dataFileName.$wsExtension;
-  	chmod ($outputFile, 0664);
-  	$outputFile = 'http://'.str_replace(BASE_PATH,$_SERVER['SERVER_NAME'].APACHE_ALIAS,$outputFile);
-  	
-  	$obj = (object)array(
-  			'id' => $downloadResult['id']
-  	);
-  	
-  	try {
-  		$downloadResult = $this->requestManager->runIHMRequest($this->userID, $this->getIPclient(), FunctionTypeEnumClass::PROCESSDELETE, $obj);
-  	} catch (Exception $e) {
-  		//Nothing to do
-  	}
-  	
-  	return  array('success' => true, 'dataFileURLs' => $outputFile);
-     
-  }
-
-   protected function timeIntervalToDuration($startTime,$stopTime) {
-
-      $duration = strtotime($stopTime) - strtotime($startTime);
-      $durationDay  = intval($duration/(86400)); 
-      $duration = $duration - $durationDay*86400;
-      $durationHour = intval($duration/(3600));
-      $duration = $duration - $durationHour*3600;
-      $durationMin = intval($duration/(60));
-      $durationSec = $duration - $durationMin*60;
-      
-      return array("success" => true, "days"  => sprintf("%04s",   strval($durationDay)),
-      "hours" => sprintf("%02s",   strval($durationHour)),
-      "mins"  => sprintf("%02s",   strval($durationMin)),
-      "secs"  => sprintf("%02s",   strval($durationSec))
-      );
-  }
-
-  protected function getDataFileName($vars, $multiParam){
-	if ($vars['startTime'] && $vars['stopTime'] && $vars['parameterID'] && !$multiParam){
-		$fileName = $vars['parameterID']."-".strtotime($vars['startTime'])."-".strtotime($vars['stopTime']);
-  		if (isset($vars['sampling']) && $vars['sampling'] != "" && $vars['sampling'] != 0)
-  			$fileName .= "-".$vars['sampling'];
-  		return array('success' => true, 'fileName' => $fileName);
-	}
-    else if ($vars['startTime'] && $vars['stopTime'] && $vars['datasetID'] && $multiParam){
-		$datasetName = strtr($vars["datasetID"], array(":" => "_"));
-		$fileName = $datasetName."-".strtotime($vars['startTime'])."-".strtotime($vars['stopTime']);
-		if (isset($vars['sampling']) && $vars['sampling'] != "" && $vars['sampling'] != 0)
-			$fileName .= "-".$vars['sampling'];
-		return array('success' => true, 'fileName' => $fileName);
-	}
-	else {
-		if (!$vars['startTime'])
-			$message="Start time not specified";
-		if (!$vars['stopTime'])
-			$message="Stop time not specified";
-		if (!$vars['parameterID'] && !$multiParam)
-			$message="Parameter not specified";
-		if (!$vars['datasetID'] && $multiParam)
-			$message="DataSet not specified";
-		return array('success' => false, 'message' => $message);
-	}
-  }
-
-   private  function compress($srcName, $dstName) {
-
-      $fp = fopen($srcName, "r");
-      $data = fread ($fp, filesize($srcName));
-      fclose($fp);
-
-      $zp = gzopen($dstName, "w9");
-      gzwrite($zp, $data);
-      gzclose($zp);
-    }
-
-}
-?>
 \ No newline at end of file
 <?php
- /**
+/**
  * @file config.php
  * @version $Id: config.php 2368 2014-05-21 08:46:23Z elena $
  */
@@ -35,6 +35,7 @@ if (!defined(&#39;PHP_VERSION_ID&#39;)) {
 	define('PHP_VERSION_ID', ($version[0] * 10000 + $version[1] * 100 + $version[2]));
 }
 if (!defined('MAGIC_FILE')) define('MAGIC_FILE','/usr/share/misc/magic');
+
 date_default_timezone_set('UTC');
 //  GUESTS LOGIN section
@@ -48,7 +49,7 @@ define(&#39;DISK_QUOTA_standard&#39;, 1024*1024*200); // 200MB
 // max lines of uploaded ascii file to show
 define('MAX_FILE_INDEX_TO_SHOW', 100);
 // private key used to be considerate as a trust client for some functions of DD web service
-define('DDSERVICE_PRIVATEKEY','!%p856Dc');
+define('DDSERVICE_PRIVATEKEY', '!%p856Dc');
 //  BATCH JOBS section  
@@ -58,12 +59,13 @@ define(&#39;DDSERVICE_PRIVATEKEY&#39;,&#39;!%p856Dc&#39;);
 //define('TIMEOUT', '100'); //TODO secs wait before job is killed  OR 'max_execution_time' - kill automatic?
 // EPN-TAP services
-define('EPNTAP_APIS','http://voparis-tap.obspm.fr/__system__/tap/run/tap/sync');
-define('EPNTAP_AMDA','http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap/sync');
+define('EPNTAP_APIS', 'http://voparis-tap.obspm.fr/__system__/tap/run/tap/sync');
+define('EPNTAP_AMDA', 'http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap/sync');
 // PHP run-time settings 
 ini_set('memory_limit',128000000);
 ini_set('max_execution_time',600); // max PHP execution
+
 ini_set('default_socket_timeout', 600); //TODO if this is needed ? IMPEX LONG DURATION WEBSERVICES
 // to avoid 403 error while copying from URL
 ini_set('user_agent', 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:7.0) Gecko/201001012 Firefox/7.0');
@@ -74,7 +76,6 @@ ini_set(&#39;user_agent&#39;, &#39;Mozilla/5.0 (X11; U; Linux i686; en-US; rv:7.0) Gecko/201
 // General Info dirs
 define('DATAPATH', IHM_SRC_DIR.'/generic_data/');
-//define('Param', DATAPATH.'Param/');
 define('LocalData', DATAPATH.'/LocalData/');
 define('PARAMS_LOCALDB_DIR', LocalData.'/ParamDef/');
 define('PARAMS_LOCALINFO_DIR', LocalData.'/ParamInfo/');
@@ -85,7 +86,6 @@ define(&#39;DataSetInfo&#39;, LocalData.&#39;/DataSetInfo/&#39;);
 define('RemoteData', DATAPATH.'/RemoteData/');
 define('Functions', DATAPATH.'/Functions/');
 define('HelpAuto', DATAPATH.'/help/auto/');
-//define('Plot', DATAPATH.'Plot/');
 define('Hst', DATAPATH.'/Hst/');
 define('SpecialSettingsDir',DATAPATH.'/SpecialSettings/');
@@ -109,15 +109,9 @@ define(&#39;USERPATH&#39;, IHM_SRC_DIR.&#39;/data/&#39;);
 // Shared dir
 define('SHAREDPATH', IHM_SRC_DIR.'/shared_data/');
-// WEB SERVICES section
-define('WSRESULT', USERPATH.'/WSRESULT/'); // Web Services result directory
-define('wsResultsXml',WSRESULT.'/WSresults.xml'); // Web Service result file
-define('plotsXml', IHM_SRC_DIR.'/public/WebServices/XML/AmdaPlots.xml'); // Web Service getPlot : list of parameters to plot
-
 // Web Service servers WSDL : $_SERVER['SERVER_NAME'] (par apache)  gethostname() (par command)
 $SERVER_NAME =  $_SERVER['SERVER_NAME'] ? $_SERVER['SERVER_NAME'] : gethostname();
 define('webAlias',"http://".$SERVER_NAME.APACHE_ALIAS);
-define('wsdl_AMDA', webAlias."/public/wsdl/Methods_AMDA.wsdl");
 define('DD_WSDL',DDSERVICE.'/dd.wsdl');
@@ -129,6 +123,7 @@ define(&#39;XMLPATH&#39;, IHM_SRC_DIR.&#39;/php/XML/&#39;);
 require_once(INTEGRATION_BASE_PATH.'/src/amdaintegration_autoload.php');
+
 global $API;
 $API = array(
 	'AmdaAction'=>array(
@@ -43,7 +43,7 @@
 				$instruments =  $node->getElementsByTagName('instrument');
 				foreach ($instruments as $ins)
 				{
-					if ($ins->getAttribute('name') != 'Ephemeris') continue;
+					if (substr($ins->getAttribute('name'),0,9) != 'Ephemeris') continue; // Ephemeris: cruise
 					$parameters = $ins->getElementsByTagName('parameter');
 					foreach ($parameters as $parameter)
 					{
@@ -59,7 +59,12 @@
 								$orbitNode->setAttribute('xml:id',$parameter->getAttribute('xml:id'));
 								$orbitNode->setAttribute('coordinate_system', $paramXml->info->coordinates_system);
 								$orbitNode->setAttribute('units', $paramXml->info->units);
-								$orbitNode->setAttribute('mission', $node->getAttribute('name'));
+								
+								$name = strtolower($node->getAttribute('name'));
+								$name = preg_replace('/\s+/', '', $name);
+								$name = str_replace('-', '', $name);
+								
+								$orbitNode->setAttribute('mission', $name);
 								if ( $node->tagName == 'observatory' )
 									$orbitNode->setAttribute('missionGroup',$node->parentNode->getAttribute('name'));
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file getParameter.php
+ * @brief  REST interface for service getParameter
+ *
+ *
+ * @version $Id:  $
+ */
+
+require_once '../config.php';
+
+$amda_ws = new WebServer();
+$result = $amda_ws->getNewToken($_GET);
+
+if ($result['success']) {
+    echo $result['token'];
+} else {
+    echo $result['message'];
+}
+
+?>
 \ No newline at end of file
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @file getDataset.php
+ * @brief  REST interface for service getDataset
+ */
+ 
+//ini_set("allow_url_fopen", true);
+	require_once '../config.php';
+
+	if (!key_exists("token", $_GET)) 
+	{
+		$result = array('success' => false, 'message' => "Authentication is required for this webservice.");
+		exit(json_encode($result));
+	}
+
+	$amda_ws = new WebServer();
+	
+	if ($amda_ws->getNewToken()['token'] != $_GET["token"]) 
+	{
+		$result = array('success' => false, 'status' => 'expired', 'message' => "Token expired. Please authenticate again.");
+	} else 
+	{
+		$result = $amda_ws->getDataset($_GET);
+	}
+
+	echo json_encode($result);
+?>
@@ -1,38 +0,0 @@
-<?php
-/** 
-*   @file getParameter.php 
-*   @brief  REST interface for service getParameter
-*
-*   
-*   @version $Id:  $ 
-*/
-  ini_set("allow_url_fopen", true);
-  require_once '../config.php';
-
-  $amda_ws = new WebServer();
-  $result = $amda_ws->getDataset($_GET);
-
-  if ($result['success']){
-      $file = str_replace("http://oberoi.cesr.fr/AMDA-WS/",BASE_PATH ,$result['dataFileURLs']);
-
-      if ($file){
-// 	header('Content-type: text/xml');
-//         $contenu = file_get_contents($file); 
-// error_log($contenu,3,'/home/natacha/TMP/tmp.xml');        
-// 	echo $contenu; 
-	
-header('Content-type: text/xml');	
-$doc = new DOMDocument();
-$doc->load($file);
-echo $doc->saveXML();
-	
-
-      }
-    }
-    else {
-      $success = "false";
-      echo '<?xml version="1.0" encoding="UTF-8"?><getParameterResponse>';
-      echo '<success>'.$success.'</success>';
-      echo '<message>'.$result['message'].'</message></getParameterResponse>';  
-    }
-?>
 <?php
-  
-/** 
-*   @file getParameter.php 
-*   @brief  REST interface for service getParameter
-*
-*   
-*   @version $Id:  $ 
-*/
-  require_once '../config.php';
+/**
+ * @file getOrbites.php
+ * @brief REST interface for service getOrbites
+ */
-  $amda_ws = new WebServer();
-  $result = $amda_ws->getOrbites($_GET);
+	require_once '../config.php';
- if ($result['success']){
-	echo $result['dataFileURLs'];
-   }
-    else {
-     echo $result['message'];  
-    }
+	if (!key_exists("token", $_GET)) 
+	{
+		$result = array('success' => false, 'message' => "Authentication is required for this webservice.");
+		exit(json_encode($result));
+	} 
+	
+	$amda_ws = new WebServer();
+	
+	if ($amda_ws->getNewToken()['token'] != $_GET["token"]) 
+	{
+		$result = array('success' => false, 'status' => 'expired', 'message' => "Token expired. Please authenticate again.");
+	} else 
+	{
+		$result = $amda_ws->getOrbites($_GET);
+	}
+
+	echo json_encode($result);
 ?>
 \ No newline at end of file
 <?php
-  
-/** 
-*   @file getParameter.php 
-*   @brief  REST interface for service getParameter
-*
-*   
-*   @version $Id:  $ 
-*/
-  require_once '../config.php';
+/**
+ * @file getParameter.php
+ * @brief  REST interface for service getParameter
+ */
-  $amda_ws = new WebServer();
-  $result = $amda_ws->getParameter($_GET);
+	require_once '../config.php';
- if ($result['success']){
-	echo $result['dataFileURLs'];
-   }
-    else {
-     echo $result['message'];  
-    }
+	if (!key_exists("token", $_GET)) 
+	{
+		$result = array('success' => false, 'message' => "Authentication is required for this webservice.");
+		exit(json_encode($result));
+	} 
+	
+	$amda_ws = new WebServer();
+	if ($amda_ws->getNewToken()['token'] != $_GET["token"]) 
+	{
+		$result = array('success' => false, 'status' => 'expired', 'message' => "Token expired. Please authenticate again.");
+	} else 
+	{
+		$result = $amda_ws->getParameter($_GET);
+	}
+	
+	echo json_encode($result);
 ?>
 \ No newline at end of file
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @file getStatus.php
+ * @brief  REST interface for service getParameter
+ *
+ * @version $Id:  $
+ */
+
+require_once '../config.php';
+
+if (!key_exists("id", $_GET)) {
+	$result = array('success' => false, 'message' => "You must provide a job id");
+} else {
+	$amda_ws = new WebServer();
+	$result = $amda_ws->getStatus($_GET);
+}
+echo json_encode($result);
 \ No newline at end of file
@@ -3,23 +3,20 @@
 /** 
 *   @file getTimeTablesList.php
 *   @brief  REST interface for service getTimeTablesList
-*
-*   
-*   @version $Id:  $ 
 */
- require_once '../config.php';
+	require_once '../config.php';
-  $amda_ws = new WebServer();
+	$amda_ws = new WebServer();
-  $result = $amda_ws->getTimeTablesList($_GET);
+	$result = $amda_ws->getTimeTablesList($_GET);
-  if ($result['success']){
-	echo $result['TimeTablesList'];
-   }
-    else {
-      echo $result['message'];  
-    }
+	if ($result['success'])
+	{
+		echo $result['TimeTablesList'];
+	}
+	else 
+	{
+		echo $result['message'];  
+	}
 ?>
-
-
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<des>
-  <missions>
-    <mission xml:id='ACE' name='ACE'>         
-	  <param name='sw_vb' class="plasma" description="velocity_magnitude" instrument="SWEPAM"/> 
-	  <param name='sw_t' class="plasma" description="temperature_radial" instrument="SWEPAM"/>	             
-	  <param name='sw_n' class="plasma" description="ion_density" instrument="SWEPAM"/>
-	  <param name='imf' class="mag" description="magnetic_field_vector" instrument="MAG"/> 
-	  <param name='imf_mag'  class="mag" description="magnetic_field_magnitude" instrument="MAG"/>	  
-    </mission>
-    <mission xml:id='WIND' name='WIND'>
-	  <param name='wnd_swe_vmag' class="plasma" description="velocity_magnitude" instrument="SWE"/> 	         
-          <param name='wnd_swe_vth' class="plasma" description="v_thermal" instrument="SWE"/> 
-          <param name='wnd_swe_n' class="plasma" description="ion_density" instrument="SWE"/> 
-	  <param name='wnd_b' class="mag" description="magnetic_field_vector" instrument="MFI"/> 
-	  <param name='wnd_bmag' class="mag" description="magnetic_field_magnitude" instrument="MFI"/>	  
-    </mission> 
-    <mission xml:id='STEREO-A' name='STA'>
-	  <param name='vpbulk_sta' class="plasma" description="velocity_magnitude" instrument="PLASTIC"/>
-	  <param name='vth_sta' class="plasma" description="v_thermal" instrument="PLASTIC"/>
-	  <param name='np_sta' class="plasma" description="ion_density" instrument="PLASTIC"/>
-	  <param name='sta_b' class="mag" description="magnetic_field_vector" instrument="MAG" />	
-	  <param name='sta_btot' class="mag" description="magnetic_field_magnitude" instrument="MAG" />	 
-    </mission>  
-    <mission xml:id='STEREO-B' name='STB'>
-	  <param name='vpbulk_stb' class="plasma" description="velocity_magnitude" instrument="PLASTIC"/>
-	  <param name='vth_stb' class="plasma" description="v_thermal" instrument="PLASTIC"/>
-	  <param name='np_stb' class="plasma" description="ion_density" instrument="PLASTIC"/>
-	  <param name='stb_b' class="mag" description="magnetic_field_vector" instrument="MAG"/>	
-	  <param name='stb_btot' class="mag" description="magnetic_field_magnitude" instrument="MAG"/>	 
-    </mission> 
-    <mission xml:id='VEX' name='VEX'>         
-	  <param name='vex_mag_4s' class="mag" description="magnetic_field_magnitude" instrument="MAG"/>
-	  <param name='vex_mag_4s_tot' class="mag" description="magnetic_field_magnitude" instrument="MAG"/>
-    </mission>    
-    <mission xml:id='OMNI' name='OMNI'>         
-	  <param name='omni_sw_v' class="plasma" description="velocity" instrument="imf/sw/indices"/>
-	  <param name='omni_sw_t' class="plasma" description="temperature" instrument="imf/sw/indices"/>
-	  <param name='omni_sw_n' class="plasma" description="density" instrument="imf/sw/indices"/>
-	  <param name='omni_imf' class="mag" description="magnetic_field_magnitude" instrument="imf/sw/indices"/>
-	  <param name='omni_imf_mag' class="mag" description="magnetic_field_magnitude" instrument="imf/sw/indices"/>
-    </mission>    
-    <mission xml:id='GEOMAG' name='GEOMAG'>         
-	  <param name='omni_kp' class="mag" description="geomagnetic_indices" instrument="imf/sw/indices"/>
-	  <param name='omni_dst' class="mag" description="geomagnetic_indices" instrument="imf/sw/indices"/>
-	  <param name='omni_ae' class="mag" description="geomagnetic_indices" instrument="imf/sw/indices"/>
-    </mission>    
-  </missions> 
-</des>
@@ -30,34 +30,32 @@
             <xs:element name="getParameter" type="tns:getParameter"/>
             <xs:element name="getParameterResponse" type="tns:getParameterResponse"/>
-             <xs:element name="getDataset" type="tns:getDataset"/>
+            <xs:element name="getDataset" type="tns:getDataset"/>
             <xs:element name="getDatasetResponse" type="tns:getDatasetResponse"/>
-             <xs:element name="getPlot" type="tns:getPlot"/>
+            <xs:element name="getPlot" type="tns:getPlot"/>
             <xs:element name="getPlotResponse" type="tns:getPlotResponse"/>
-             <xs:element name="getResultPlot" type="tns:getResultPlot"/>
-            <xs:element name="getResultPlotResponse" type="tns:getResultPlotResponse"/>
-
             <xs:element name="getOrbites" type="tns:getOrbites"/>
             <xs:element name="getOrbitesResponse" type="tns:getOrbitesResponse"/> 
             <xs:element name="getObsDataTreeResponse" type="tns:getObsDataTreeResponse"/>
+            <xs:element name="getStatus" type="tns:getStatus"/>
+            <xs:element name="getStatusResponse" type="tns:getStatusResponse"/>
+            
             <xs:element name="alive" type="xs:boolean"/>
             <xs:complexType name="getObsDataTreeResponse">
                 <xs:sequence>
                     <xs:element name="success" minOccurs="0" maxOccurs="1" type="xs:boolean">
                         <xs:annotation>
-                            <xs:documentation>If methode is OK success = true, else success = false</xs:documentation>
+                            <xs:documentation>If method is OK success = true, else success = false</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="WorkSpace" type="tns:WorkSpace" minOccurs="1" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>Url's of AmdaUserTree file which must be generated
-                                after connections. Contents: AMDA local parameters, Remote
-                                Parameters, Shared Predefined Parameters. </xs:documentation>
+                            <xs:documentation>Url's of AMDA local parameters </xs:documentation>
                         </xs:annotation>
                     </xs:element>
                 </xs:sequence>
@@ -67,15 +65,12 @@
                 <xs:sequence>
                     <xs:element name="userID" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>ID of AMDA user storing in the 3DView. Must TBD. If no
-                                user ID, result is shared Timetables from IMPEX user.
-                            </xs:documentation>
+                            <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>Crypt Password of AMDA user storing in the 3DView.
-                                Must TBD encryption types</xs:documentation>
+                            <xs:documentation>Crypt Password of AMDA user </xs:documentation>
                         </xs:annotation>
                     </xs:element>
                 </xs:sequence>
@@ -85,8 +80,7 @@
                 <xs:sequence>
                     <xs:element name="success" minOccurs="0" maxOccurs="1" type="xs:boolean">
                         <xs:annotation>
-                            <xs:documentation>Url of TimeTables storage file with TimeTables
-                                ID's.</xs:documentation>
+                            <xs:documentation>If method is OK success = true, else success = false</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="TimeTablesList" minOccurs="0" maxOccurs="1" type="xs:anyURI">
@@ -102,13 +96,12 @@
                 <xs:sequence>
                     <xs:element name="userID" type="xs:string" minOccurs="1" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>ID of AMDA user</xs:documentation>
+                            <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>Crypt Password of AMDA user storing in the 3DView.
-                                Must TBD encryption types</xs:documentation>
+                            <xs:documentation>Crypt Password of AMDA user</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                 </xs:sequence>
@@ -118,16 +111,14 @@
                 <xs:sequence>
                     <xs:element name="success" minOccurs="0" maxOccurs="1" type="xs:boolean">
                         <xs:annotation>
-                            <xs:documentation>Url of TimeTables storage file with TimeTables
-                                ID's.</xs:documentation>
+                            <xs:documentation>If method is OK success = true, else success = false</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="ParameterList" type="tns:ParameterList" minOccurs="1"
                         maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>Url of AmdaUserTree file which must be generated after
-                                the user connections Contents: User groups local parameters, User
-                                remote parameters, user predefined parameters. </xs:documentation>
+                            <xs:documentation>Url of UserDefinedParameters, Url of AmdaLocalDataBaseParameters,
+                                Url of RemoteDataBaseParameters ( not implemented ) </xs:documentation>
                         </xs:annotation>
                     </xs:element>
                 </xs:sequence>
@@ -135,7 +126,7 @@
             <xs:simpleType name="enumSpacecraft">
                 <xs:restriction base="xs:string">
-                    <xs:enumeration value="Cassini_Public"/>
+                    <xs:enumeration value="Cassini"/>
                     <xs:enumeration value="Galileo"/>
                     <xs:enumeration value="Voyager_1"/>
                     <xs:enumeration value="Voyager_2"/>
@@ -170,7 +161,19 @@
                     <xs:enumeration value="ISEE-2"/>
                 </xs:restriction>
             </xs:simpleType>
-
+            
+            <xs:simpleType name="enumMission">
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="ACE"/>
+                    <xs:enumeration value="STEREO-A"/>
+                    <xs:enumeration value="STEREO-B"/>
+                    <xs:enumeration value="WIND"/>
+                    <xs:enumeration value="VEX"/>
+                    <xs:enumeration value="OMNI"/>
+                    <xs:enumeration value="GEOMAG"/>
+               </xs:restriction>
+            </xs:simpleType>        
+                               
             <xs:simpleType name="WorkSpaceValue">
                 <xs:restriction base="xs:string">
                     <xs:enumeration value="TimeTables"/>
@@ -673,21 +676,18 @@ of a set of typically orthogonal axes.
                     </xs:element>
                     <xs:element name="userID" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>ID of AMDA user storing in the 3DView. Must TBD For
-                                public data is optional. </xs:documentation>
+                            <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>Crypt Password of AMDA user storing in the 3DView.
-                                Must TBD encryption types Required for predefined parameters.
-                            </xs:documentation>
+                            <xs:documentation>Crypt Password of AMDA user </xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="outputFormat" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation> Choice is possible between the two formats: netCDF,
-                                ASCII and VOTable. If the format is not specified it will be netCDF
+                            <xs:documentation> Choice is possible between the four formats: netCDF, CDF,
+                                ASCII and VOTable. If the format is not specified it will be ASCIIF
                                 by default</xs:documentation>
                         </xs:annotation>
                         <xs:simpleType>
@@ -695,6 +695,7 @@ of a set of typically orthogonal axes.
                                 <xs:enumeration value="netCDF"/>
                                 <xs:enumeration value="VOTable"/>
                                 <xs:enumeration value="ASCII"/>
+                                <xs:enumeration value="CDF"/>
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
@@ -724,20 +725,77 @@ of a set of typically orthogonal axes.
                 <xs:sequence>
                     <xs:element name="success" minOccurs="0" maxOccurs="1" type="xs:boolean">
                         <xs:annotation>
-                            <xs:documentation>Url of TimeTables storage file with TimeTables
-                                ID's.</xs:documentation>
+                            <xs:documentation>If method is OK success = true, else success = false</xs:documentation>
                         </xs:annotation>
                     </xs:element>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="dataFileURLs"
-                        type="xs:anyURI">
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="dataFileURLs" type="xs:anyURI">
                         <xs:annotation>
-                            <xs:documentation>URLs of results data files. If not URLs - not data for
+                            <xs:documentation>URLs of results data files. If no URLs - no data for
                                 required parameters</xs:documentation>
                         </xs:annotation>
                     </xs:element>
+                    <xs:element maxOccurs="1" minOccurs="0" name="status">
+                        <xs:annotation>
+                            <xs:documentation></xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleType>
+                            <xs:restriction base="xs:string">
+                                <xs:enumeration value="in progress"/>
+                                <xs:enumeration value="error"/>
+                            </xs:restriction>
+                        </xs:simpleType>
+                    </xs:element>
+                     <xs:element maxOccurs="1" minOccurs="0" name="id" type="xs:string">
+                        <xs:annotation>
+                            <xs:documentation>process ID</xs:documentation>
+                        </xs:annotation>
+                    </xs:element>  
                 </xs:sequence>
             </xs:complexType>
-            
+
+            <xs:complexType name="getStatus">
+               <xs:sequence>
+                 <xs:element minOccurs="1" maxOccurs="1" name="id" type="xs:string">
+                    <xs:annotation>
+                        <xs:documentation>process ID</xs:documentation>
+                    </xs:annotation>
+                 </xs:element>  
+               </xs:sequence>
+           </xs:complexType>
+
+            <xs:complexType name="getStatusResponse">
+                <xs:sequence>
+                    <xs:element name="success" minOccurs="0" maxOccurs="1" type="xs:boolean">
+                        <xs:annotation>
+                            <xs:documentation></xs:documentation>
+                        </xs:annotation>
+                    </xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="dataFileURLs" type="xs:anyURI">
+                        <xs:annotation>
+                            <xs:documentation>URLs of results data files. If no URLs - no data for
+                                required parameters</xs:documentation>
+                        </xs:annotation>
+                    </xs:element>
+						  <xs:element maxOccurs="1" minOccurs="0" name="plotURL" type="xs:anyURI">
+                        <xs:annotation>
+                            <xs:documentation>URLs of results plot files. If no URLs - no data for
+                                required parameters</xs:documentation>
+                        </xs:annotation>
+                    </xs:element>
+                    <xs:element maxOccurs="1" minOccurs="0" name="status">
+                        <xs:annotation>
+                            <xs:documentation></xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleType>
+                            <xs:restriction base="xs:string">
+                                <xs:enumeration value="in progress"/>
+                                <xs:enumeration value="error"/> 
+                            </xs:restriction>
+                        </xs:simpleType>
+                    </xs:element>  
+                </xs:sequence>
+            </xs:complexType>
+				
              <xs:complexType name="getDataset">
                 <xs:sequence>
                     <xs:element name="startTime" type="xs:string" minOccurs="1" maxOccurs="1">
@@ -763,21 +821,18 @@ of a set of typically orthogonal axes.
                     </xs:element>
                     <xs:element name="userID" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>ID of AMDA user. For
-                                public data is optional. </xs:documentation>
+                            <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>Crypt Password of AMDA user.
-                                Must TBD encryption types Required for predefined parameters.
-                            </xs:documentation>
+                            <xs:documentation>Crypt Password of AMDA user </xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="outputFormat" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation> Choice is possible between the 3 formats: netCDF,
-                                ASCII and VOTable. If the format is not specified it will be netCDF
+                            <xs:documentation> Choice is possible between the four formats: netCDF, CDF,
+                                ASCII and VOTable. If the format is not specified it will be ASCII
                                 by default</xs:documentation>
                         </xs:annotation>
                         <xs:simpleType>
@@ -785,6 +840,7 @@ of a set of typically orthogonal axes.
                                 <xs:enumeration value="netCDF"/>
                                 <xs:enumeration value="VOTable"/>
                                 <xs:enumeration value="ASCII"/>
+                                <xs:enumeration value="CDF"/>
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
@@ -814,17 +870,32 @@ of a set of typically orthogonal axes.
                 <xs:sequence>
                     <xs:element name="success" minOccurs="0" maxOccurs="1" type="xs:boolean">
                         <xs:annotation>
-                            <xs:documentation>Url of TimeTables storage file with TimeTables
-                                ID's.</xs:documentation>
+                            <xs:documentation></xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="dataFileURLs"
                         type="xs:anyURI">
                         <xs:annotation>
                             <xs:documentation>URLs of results data files. If not URLs - not data for
-                                required parameters</xs:documentation>
+                                required datasets</xs:documentation>
                         </xs:annotation>
                     </xs:element>
+                    <xs:element maxOccurs="1" minOccurs="0" name="status">
+                        <xs:annotation>
+                            <xs:documentation></xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleType>
+                            <xs:restriction base="xs:string">
+                                <xs:enumeration value="in progress"/>
+                                <xs:enumeration value="error"/>
+                            </xs:restriction>
+                        </xs:simpleType>
+                    </xs:element>
+                     <xs:element maxOccurs="1" minOccurs="0" name="id" type="xs:string">
+                        <xs:annotation>
+                            <xs:documentation>process ID</xs:documentation>
+                        </xs:annotation>
+                    </xs:element> 
                 </xs:sequence>
             </xs:complexType>           
@@ -840,7 +911,7 @@ of a set of typically orthogonal axes.
                             <xs:documentation>Stop time in ISO 8601 format</xs:documentation>
                         </xs:annotation>
                     </xs:element>
-                    <xs:element name="missionID" type="xs:string" minOccurs="1" maxOccurs="1">
+                    <xs:element name="missionID" type="tns:enumMission" minOccurs="1" maxOccurs="1">
                         <xs:annotation>
                             <xs:documentation>Id of mission defined in 
                                 Amda LocalParams.xml</xs:documentation>
@@ -853,7 +924,7 @@ of a set of typically orthogonal axes.
                     </xs:element>
                     <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>Password of AMDA</xs:documentation>
+                            <xs:documentation>Password of AMDA user</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                 </xs:sequence>
@@ -866,32 +937,23 @@ of a set of typically orthogonal axes.
                             <xs:documentation>success or not</xs:documentation>
                         </xs:annotation>
                     </xs:element>
-                    <xs:element name="plotDirectoryURL" type="xs:string" minOccurs="1" maxOccurs="1">
-                        <xs:annotation>
-                            <xs:documentation>URL of directory of png file</xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                </xs:sequence>
-            </xs:complexType>           
-
-            <xs:complexType name="getResultPlot">
-                <xs:sequence>
-                    <xs:element name="plotDirectoryURL" type="xs:string" minOccurs="1" maxOccurs="1">
+                  <xs:element maxOccurs="1" minOccurs="0" name="status">
                         <xs:annotation>
-                            <xs:documentation>URL of directory of png file</xs:documentation>
+                            <xs:documentation></xs:documentation>
                         </xs:annotation>
+                        <xs:simpleType>
+                            <xs:restriction base="xs:string">
+                                <xs:enumeration value="in progress"/>
+                                <xs:enumeration value="error"/>
+                            </xs:restriction>
+                        </xs:simpleType>
                     </xs:element>
-                </xs:sequence>
-            </xs:complexType>           
-
-            <xs:complexType name="getResultPlotResponse">
-                <xs:sequence>
-                    <xs:element name="success" minOccurs="1" maxOccurs="1" type="xs:boolean">
+                     <xs:element maxOccurs="1" minOccurs="0" name="id" type="xs:string">
                         <xs:annotation>
-                            <xs:documentation>success=true if plot exists and else false </xs:documentation>
+                            <xs:documentation>process ID</xs:documentation>
                         </xs:annotation>
                     </xs:element>
-                    <xs:element name="plotFileURL" type="xs:anyURI" minOccurs="0" maxOccurs="1">
+                    <xs:element name="plotFileURL" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
                             <xs:documentation>URL of png file</xs:documentation>
                         </xs:annotation>
@@ -913,7 +975,7 @@ of a set of typically orthogonal axes.
                     </xs:element>
                     <xs:element name="spacecraft" type="tns:enumSpacecraft" maxOccurs="1" minOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>List of spavecrafts from AMDA</xs:documentation>
+                            <xs:documentation>List of spacecraft from AMDA</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="coordinateSystem" type="tns:enumCoordinateSystemName" minOccurs="1" maxOccurs="1">
@@ -948,21 +1010,18 @@ of a set of typically orthogonal axes.
                     </xs:element>
                     <xs:element name="userID" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>ID of AMDA user storing in the 3DView. Must TBD For
-                                public data is optional. </xs:documentation>
+                            <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>Crypt Password of AMDA user storing in the 3DView.
-                                Must TBD encryption types Required for predefined parameters.
-                            </xs:documentation>
+                            <xs:documentation>Crypt Password of AMDA user </xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="outputFormat" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation> Choice is possible between the two formats: netCDF,
-                                ASCII and VOTable. If the format is not specified it will be netCDF
+                            <xs:documentation> Choice is possible between the four formats: netCDF, CDF,
+                                ASCII and VOTable. If the format is not specified it will be ASCII
                                 by default</xs:documentation>
                         </xs:annotation>
                         <xs:simpleType>
@@ -970,6 +1029,7 @@ of a set of typically orthogonal axes.
                                 <xs:enumeration value="netCDF"/>
                                 <xs:enumeration value="VOTable"/>
                                 <xs:enumeration value="ASCII"/>
+                                <xs:enumeration value="CDF"/>
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
@@ -999,8 +1059,7 @@ of a set of typically orthogonal axes.
                 <xs:sequence>
                     <xs:element name="success" minOccurs="0" maxOccurs="1" type="xs:boolean">
                         <xs:annotation>
-                            <xs:documentation>Url of TimeTables storage file with TimeTables
-                                ID's.</xs:documentation>
+                            <xs:documentation></xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="dataFileURLs"
@@ -1010,6 +1069,22 @@ of a set of typically orthogonal axes.
                                 required parameters</xs:documentation>
                         </xs:annotation>
                     </xs:element>
+                    <xs:element maxOccurs="1" minOccurs="0" name="status">
+                        <xs:annotation>
+                            <xs:documentation></xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleType>
+                            <xs:restriction base="xs:string">
+                                <xs:enumeration value="in progress"/>
+                                <xs:enumeration value="error"/>
+                            </xs:restriction>
+                        </xs:simpleType>
+                    </xs:element>
+                     <xs:element maxOccurs="1" minOccurs="0" name="id" type="xs:string">
+                        <xs:annotation>
+                            <xs:documentation>process ID</xs:documentation>
+                        </xs:annotation>
+                    </xs:element>  
                 </xs:sequence>
             </xs:complexType>
@@ -1017,21 +1092,17 @@ of a set of typically orthogonal axes.
                 <xs:sequence>
                     <xs:element name="userID" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>ID of AMDA user storing in the 3DView. Must
-                                TBD</xs:documentation>
+                            <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>Crypt Password of AMDA user storing in the 3DView.
-                                Must TBD encryption types Required for predefined parameters.
-                            </xs:documentation>
+                            <xs:documentation>Crypt Password of AMDA user </xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="ttID" type="xs:string" minOccurs="1" maxOccurs="1">
                         <xs:annotation>
-                            <xs:documentation>Id of time tables(TT) defined in
-                                AmdaUserTree.xml</xs:documentation>
+                            <xs:documentation>Id of time table</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                 </xs:sequence>
@@ -1040,8 +1111,7 @@ of a set of typically orthogonal axes.
                 <xs:sequence>
                     <xs:element name="success" minOccurs="0" maxOccurs="1" type="xs:boolean">
                         <xs:annotation>
-                            <xs:documentation>Url of TimeTables storage file with TimeTables
-                                ID's.</xs:documentation>
+                            <xs:documentation></xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element name="ttFileURL" type="xs:anyURI" minOccurs="1" maxOccurs="1">
@@ -1071,7 +1141,7 @@ of a set of typically orthogonal axes.
     </wsdl:message>
     <wsdl:message name="getObsDataTree">
-        <wsdl:part name="parameters" element="tns:emptyElement"> </wsdl:part>
+        <wsdl:part name="parameters" element="tns:emptyElement"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="getObsDataTreeResponse">
@@ -1103,7 +1173,7 @@ of a set of typically orthogonal axes.
     </wsdl:message>
     <wsdl:message name="getDataset">
-        <wsdl:part name="parameters" element="tns:getDataset"> </wsdl:part>
+        <wsdl:part name="parameters" element="tns:getDataset"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="getDatasetResponse">
@@ -1118,15 +1188,14 @@ of a set of typically orthogonal axes.
         <wsdl:part name="parameters" element="tns:getPlotResponse"> </wsdl:part>
     </wsdl:message>
-    <wsdl:message name="getResultPlot">
-        <wsdl:part name="parameters" element="tns:getResultPlot"> </wsdl:part>
+    <wsdl:message name="getStatus">
+        <wsdl:part name="parameters" element="tns:getStatus"></wsdl:part>
     </wsdl:message>
-    <wsdl:message name="getResultPlotResponse">
-        <wsdl:part name="parameters" element="tns:getResultPlotResponse"> </wsdl:part>
+    <wsdl:message name="getStatusResponse">
+        <wsdl:part name="parameters" element="tns:getStatusResponse"> </wsdl:part>
     </wsdl:message>
-
-
+	 
     <wsdl:message name="getOrbites">
         <wsdl:part name="parameters" element="tns:getOrbites"> </wsdl:part>
     </wsdl:message>
@@ -1171,7 +1240,12 @@ of a set of typically orthogonal axes.
             <wsdl:input message="tns:getParameter"> </wsdl:input>
             <wsdl:output message="tns:getParameterResponse"> </wsdl:output>
         </wsdl:operation>
-
+		  
+        <wsdl:operation name="getStatus">
+            <wsdl:input message="tns:getStatus"> </wsdl:input>
+            <wsdl:output message="tns:getStatusResponse"> </wsdl:output>
+        </wsdl:operation>
+		  
         <wsdl:operation name="getDataset">
             <wsdl:input message="tns:getDataset"> </wsdl:input>
             <wsdl:output message="tns:getDatasetResponse"> </wsdl:output>
@@ -1182,11 +1256,6 @@ of a set of typically orthogonal axes.
             <wsdl:output message="tns:getPlotResponse"> </wsdl:output>
         </wsdl:operation>
-        <wsdl:operation name="getResultPlot">
-            <wsdl:input message="tns:getResultPlot"> </wsdl:input>
-            <wsdl:output message="tns:getResultPlotResponse"> </wsdl:output>
-        </wsdl:operation>
-        
         <wsdl:operation name="getOrbites">
             <wsdl:input message="tns:getOrbites"> </wsdl:input>
             <wsdl:output message="tns:getOrbitesResponse"> </wsdl:output>
@@ -1253,8 +1322,8 @@ of a set of typically orthogonal axes.
                 <soap:body use="literal"/>
             </wsdl:output>
         </wsdl:operation>
-
-        <wsdl:operation name="getDataset">
+		  
+       <wsdl:operation name="getStatus">
             <soap:operation soapAction="" style="document"/>
             <wsdl:input>
                 <soap:body use="literal"/>
@@ -1263,8 +1332,8 @@ of a set of typically orthogonal axes.
                 <soap:body use="literal"/>
             </wsdl:output>
         </wsdl:operation>
- 
-        <wsdl:operation name="getPlot">
+		  
+        <wsdl:operation name="getDataset">
             <soap:operation soapAction="" style="document"/>
             <wsdl:input>
                 <soap:body use="literal"/>
@@ -1274,7 +1343,7 @@ of a set of typically orthogonal axes.
             </wsdl:output>
         </wsdl:operation>
-        <wsdl:operation name="getResultPlot">
+        <wsdl:operation name="getPlot">
             <soap:operation soapAction="" style="document"/>
             <wsdl:input>
                 <soap:body use="literal"/>
@@ -1309,7 +1378,7 @@ of a set of typically orthogonal axes.
     <wsdl:service name="Methods_AMDA">
         <wsdl:port name="Methods_AMDAPort" binding="tns:Methods_AMDASoapBinding">
-            <soap:address location="http://apus.cesr.fr/AMDA-TEST/php/AMDA_METHODS_WSDL.php"/>
+            <soap:address location="http://amdadev.irap.omp.eu/php/AMDA_METHODS_WSDL.php"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>