Support request from WS + Add some new test parameters

Benjamin Renard
1 parent 05da1b4d
Showing 8 changed files with 161 additions and 15 deletions Show diff stats
install/testParams/newKernelDDBase/asy.xml
install/testParams/newKernelDDBase/sw_n.xml
install/testParams/newKernelDDBase/sw_t.xml
install/testParams/newKernelDDBase/sw_vb.xml
install/testParams/newKernelDDBase/sym.xml
src/InputOutput/IHMImpl/Params/DownloadImpl/IHMInputOutputParamsDownloadClass.php
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/InputOutput/IHMImpl/Tools/IHMUserParamLoaderClass.php
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<param xml:id="asy">
+  <get> 
+  	<vi name="ground:based:asy">
+  		<baseParam name="ASY"/>
+	</vi>
+  </get>
+  <process/>
+  <output/>
+</param>
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id='sw_n'>
+	<get>
+		<vi name='ace:swe:all'>
+			<baseParam name='Np'/>
+		</vi>
+	</get>
+	<process/>
+  	<output/>
+</param>
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id='sw_t'>
+	<get>
+		<vi name='ace:swp:all'>
+			<baseParam name='Tp'/>
+		</vi>
+	</get>
+	<process/>
+  	<output/>
+</param>
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id='sw_vb'>
+	<get>
+		<vi name='ace:swe:all'>
+			<baseParam name='Vp'/>
+		</vi>
+	</get>
+	<process/>
+  	<output/>
+</param>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<param xml:id="sym">
+  <get> 
+  	<vi name="ground:based:asy">
+  		<baseParam name="SYM"/>
+	</vi>
+  </get>
+  <process/>
+  <output/>
+</param>
@@ -50,15 +50,19 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas
 		{
 			case "ASCII" :
 				$downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::ASCII);
+				$formatExtension = ".txt";
 				break;
 			case "vot" :
 				$downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::VOTABLE);
+				$formatExtension = ".vot";
 				break;
 			case "cdf" :
 				$downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::CDF);
+				$formatExtension = ".cdf";
 				break;
 			case "json" :
 				$downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::JSON);
+				$formatExtension = ".json";
 				break;
 			default :
 				throw new Exception('File format not implemented.');
@@ -105,16 +109,34 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas
 		//filecompressData  : [['zip', 'zip'], ['tar+gzip', 'tar+gzip']],
 		$extension = "";
+		$resultFilePrefix = "";
 		switch ($input->compression)
 		{
 			case "zip" :
 				$extension = ".zip";
 				$downloadNode->addPostProcessing(RequestOutputPostProcessingEnumClass::ZIP);
+				$resultFilePrefix = "download_";
 				break;
 			case "tar+gzip" :
 				$extension = ".tar.gz";
 				$downloadNode->addPostProcessing(RequestOutputPostProcessingEnumClass::TAR);
 				$downloadNode->addPostProcessing(RequestOutputPostProcessingEnumClass::GZIP);
+				$resultFilePrefix = "download_";
+				break;
+			case "gzip" :
+				$extension = $formatExtension.".gz";
+				$downloadNode->addPostProcessing(RequestOutputPostProcessingEnumClass::GZIP);
+				if ($input->fileprefix)
+					$resultFilePrefix = $input->fileprefix;
+				else
+					$resultFilePrefix = "output-";
+				break;
+			case "" :
+				$extension = $formatExtension;
+				if ($input->fileprefix)
+					$resultFilePrefix = $input->fileprefix;
+				else
+					$resultFilePrefix = "output-";
 				break;
 			default :
 				throw new Exception('Compression type not implemented.');
@@ -123,11 +145,15 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas
 		$resultFile = "result_".$this->requestID;
 		$this->paramsData->addWaitingResult(DOWNLOAD_RESULT_FILE_KEY, $resultFile);
-		$postProcessCmd  = "mv download_*";
+		$postProcessCmd  = "mv ".$resultFilePrefix."*";
+		
 		$postProcessCmd .= $extension;
 		$postProcessCmd .= " ".$resultFile.$extension;
 		$this->paramsData->setPostCmd($postProcessCmd);
+		
+		if (isset($input->disablebatch))
+			$this->paramsData->setBatchEnable(!$input->disablebatch);
 		return $this->paramsData;
 	}
@@ -11,6 +11,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 {
 	private $isInteractiveRequest = false;
+	private $isFromWS = false;
+	
 	private $interactiveRequestRealIndexes = array();
 	private $interactiveMultiPlotState = array();
 	private $interactiveTimeSelectionState = array();
@@ -44,6 +46,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		$requestIndexInParamData = 0;
 		$tabRequestIndex = 0;
 		$this->isInteractiveRequest = ($input->{'file-output'} == 'INTERACTIVE');
+		$this->isFromWS = ($input->{'file-output'} == 'WS');
 		$postProcessCmd = "";
 		foreach ($input->tabs as $tab)
 		{
@@ -119,7 +122,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			$plotOutputNode->setWriteContextFile($this->isInteractiveRequest ? "true" : "false");
 			$compression = "";
-			if (!$this->isInteractiveRequest)
+			if (!$this->isInteractiveRequest && !$this->isFromWS)
 			{
 				switch ($input->{'file-output'})
 				{
@@ -235,7 +238,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			foreach ($tab->{'panels'} as $panelData)
 				$this->unmarshallPanel($panelData, $pageNode, $paramsNode);
-			if ($this->isInteractiveRequest)
+			if ($this->isInteractiveRequest || $this->isFromWS)
 			{
 				$resultFile = $filePrefix."_*".$extension;
 				$waitingResultFile = $filePrefix.$extension;
@@ -267,8 +270,15 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				$postProcessCmd .= " | ";
 			$postProcessCmd .= "mv ".$resultFile." ".$waitingResultFile;
-			if ($this->isInteractiveRequest && $isPortrait)
+			if (($this->isInteractiveRequest) && $isPortrait)
 				$postProcessCmd .= " | convert ".$waitingResultFile." -rotate -90 ".$waitingResultFile;
+			else if ($this->isFromWS)
+			{
+				if ($isPortrait)
+					$postProcessCmd .= " | convert ".$waitingResultFile." -rotate -90 ".$input->{"ws-result-file"};
+				else
+					$postProcessCmd .= " | mv ".$waitingResultFile." ".$input->{"ws-result-file"};
+			}
 			++$tabRequestIndex;
 			++$requestIndexInParamData;
@@ -349,7 +359,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		}
 		//Panel id
-		$panelNode->setId($panelData->{'id'});
+		if (isset($panelData->{'id'}))
+			$panelNode->setId($panelData->{'id'});
 		//Panel background color
 		if (($panelData->{'panel-background-color'} != 'none') && ($panelData->{'panel-background-color'} != ''))
@@ -535,10 +546,12 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			$axisNode->getRange()->setExtend($axisData->{'axis-range-extend'} ? "true" : "false");
 		//axis color
-		$axisNode->setColor($this->hexColor2KernelColor($axisData->{'axis-color'}));
+		if (isset($axisData->{'axis-color'}))
+			$axisNode->setColor($this->hexColor2KernelColor($axisData->{'axis-color'}));
 		//axis thickness
-		$axisNode->setThickness($axisData->{'axis-thickness'});
+		if (isset($axisData->{'axis-thickness'}))
+			$axisNode->setThickness($axisData->{'axis-thickness'});
 		//axis ticks position
 		switch ($axisData->{'axis-tick-position'})
@@ -1273,9 +1286,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 	{
 		switch ($inputData->{$keyPrefix.'-style'})
 		{
-			case 'plain'           :
-				$curveNode->setStyle(RequestOutputPlotCurveStyleEnum::PLAIN);
-				break;
+			
 			case 'dot'             :
 				$curveNode->setStyle(RequestOutputPlotCurveStyleEnum::DOT);
 				break;
@@ -1285,13 +1296,16 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			case 'long-short-dot'  :
 				$curveNode->setStyle(RequestOutputPlotCurveStyleEnum::LONGSHORTDOT);
 				break;
-			default :
-				throw new Exception('Curve style not implemented.');
+			case 'plain'           :
+			default                :
+				$curveNode->setStyle(RequestOutputPlotCurveStyleEnum::PLAIN);
+				break;
 		}
-			
-		$curveNode->setWidth($inputData->{$keyPrefix.'-width'});
+		
+		if (isset($inputData->{$keyPrefix.'-width'}))
+			$curveNode->setWidth($inputData->{$keyPrefix.'-width'});
-		if ($inputData->{$keyPrefix.'-color'} != 'auto')
+		if (isset($inputData->{$keyPrefix.'-color'}) && ($inputData->{$keyPrefix.'-color'} != 'auto'))
 			$curveNode->setColor($this->hexColor2KernelColor($inputData->{$keyPrefix.'-color'}));
 	}
@@ -78,6 +78,34 @@ class IHMUserParamLoaderClass
 	}
 	/*
+	 * @brief Get derived parameter name from id
+	*/
+	public function getDerivedParameterNameFromId($paramId)
+	{
+		if (!preg_match("#^ws_#",$paramId))
+			return array("success" => false, "message" => "Bad derived parameter id");
+		
+		//try to load user parameters definition if not already done
+		if (!isset($this->userParamsList))
+			$this->userParamsList = $this->loadUserParamManagerFile();
+		
+		if (!$this->userParamsList["success"])
+			return $this->userParamsList["success"];
+		
+		if (isset($this->userParamsList["params"]) && isset($this->userParamsList["params"]["derived"]))
+		{
+			//find the parameter name
+			foreach($this->userParamsList["params"]["derived"] as $paramInfo)
+			{
+				if ($paramInfo["id"] == $paramId)
+					return array("success" => true, "name" => $paramInfo["name"]);
+			}
+		}
+
+		return array("success" => false, "message" => "Cannot find derived parameter");
+	}
+	
+	/*
 	 * @brief Get uploaded parameter info from name ("wsd_***")
 	*/
 	public function getUploadedParameterFromName($paramName)
@@ -109,6 +137,34 @@ class IHMUserParamLoaderClass
 	}
 	/*
+	 * @brief Get uploaded parameter name from id
+	*/
+	public function getUploadedParameterNameFromId($paramId)
+	{
+		if (!preg_match("#^wsd_#",$paramId))
+			return array("success" => false, "message" => "Bad uploaded parameter id");
+	
+		//try to load user parameters definition if not already done
+		if (!isset($this->userParamsList))
+			$this->userParamsList = $this->loadUserParamManagerFile();
+	
+		if (!$this->userParamsList["success"])
+			return $this->userParamsList["success"];
+	
+		if (isset($this->userParamsList["params"]) && isset($this->userParamsList["params"]["uploaded"]))
+		{
+			//find the parameter info
+			foreach($this->userParamsList["params"]["uploaded"] as $paramInfo)
+			{
+				if ($paramInfo["id"] == $paramId)
+					return array("success" => true, "name" => $paramInfo["name"]);
+			}
+		}
+	
+		return array("success" => false, "message" => "Cannot find uploaded parameter");
+	}
+	
+	/*
 	 * @brief Load derived parameter manager file
 	 */
 	private function loadUserParamManagerFile()