Fix derived parameter id in REST WS

Benjamin Renard
1 parent e0f3e2e9
Showing 1 changed file with 7 additions and 21 deletions Show diff stats
php/WebServices/WebServer.php
@@ -223,27 +223,7 @@ class WebServer
 		{
 			$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;
-			}
+			$param->paramid = $paramId;
 			$params[] = $param;
 		}
@@ -460,6 +440,7 @@ class WebServer
 			$dim_1 = empty($dim_1) ? 1 : intval($dim_1);
 			$dim_2 = $paramNode->getAttribute('dim_2');
 			$dim_2 = empty($dim_2) ? 1 : intval($dim_2);
+            $ws_id = "ws_".$paramNode->getAttribute('name');
 			$paramNode->setAttribute('size', $dim_1 * $dim_2);
 			$display_type = 'timeseries';
@@ -470,16 +451,21 @@ class WebServer
 				$display_type = 'spectrogram';
 			}
 			$paramNode->setAttribute('display_type', $display_type);
+            $paramNode->setAttribute('internal_id', $paramNode->getAttribute('xml:id'));
+            $paramNode->setAttribute('xml:id', $ws_id);
 		}
 		//  => In parameters from an uploaded file
 		$paramNodes = $dom->getElementsByTagName("mydata");
 		foreach ($paramNodes as $paramNode) {
 			// size already exists
+            $wsd_id = "wsd_".$paramNode->getAttribute('name');
 			$display_type = 'timeseries';
 			if ($paramNode->getAttribute('plottype') == 'Spectra') {
 				$display_type = 'spectrogram';
 			}
 			$paramNode->setAttribute('display_type', $display_type);
+            $paramNode->setAttribute('internal_id', $paramNode->getAttribute('xml:id'));
+            $paramNode->setAttribute('xml:id', $wsd_id);
 		}
 		$dom->save(WSConfigClass::getWsResultDir().$wsParamDst);