CDPP / AMDA_Integration

Commit 56e2072a082cbf46c3733a379261f2520b00f0f0

Authored by Benjamin Renard
2 parents cebaa4ba 058b366f
Exists in master and in 54 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, anr_tempete, cu2022, density_maps, develop, expression-parser-bre, frames-transformation, master_vge, mlplasmas, multiplot, rm_6912, rm_7926, rm_8932, save-other-requests, test-merge, ws_get_catalog

Merge branch 'master' into expression-parser-bre

Showing 2 changed files with 5 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
  Diff comments   View file @56e2072
... ... @@ -402,8 +402,10 @@ class IHMParamManagerClass
402 402  
403 403 if (!$res["success"])
404 404 throw new Exception('Error to load uploaded parameter file : '.$res["message"]);
  405 +
  406 + $paramId = $param;
405 407  
406   - $newParamNode = $paramsData->addLocalParamToCreate($res["param"]["id"],
  408 + $newParamNode = $paramsData->addLocalParamToCreate($paramId,
407 409 $res["param"]["info"]["viId"], $res["param"]["info"]["realVar"],
408 410 $res["param"]["info"]["minSampling"], $res["param"]["info"]["maxSampling"],
409 411 $res["param"]["info"]["type"],$res["param"]["info"]["size"],
... ... @@ -515,7 +517,7 @@ class IHMParamManagerClass
515 517 }
516 518 }
517 519  
518   - return array("id" => $res["param"]["id"], "plotType" => $res["param"]["info"]["plotType"]);
  520 + return array("id" => $paramId, "plotType" => $res["param"]["info"]["plotType"]);
519 521 }
520 522  
521 523 public function applyRangesAndIndexes($paramsData, $paramData, $force_total_2d, &$paramInfo) {
... ...
src/InputOutput/WSImpl/Params/DownloadImpl/WSInputOutputParamsDownloadClass.php
  Diff comments   View file @56e2072
... ... @@ -37,7 +37,7 @@ class WSInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClass
37 37 $downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::ISO);
38 38 break;
39 39 case 'UNIXTIME' :
40   - $downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::TIMESTAMP);
  40 + $downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::MS);
41 41 break;
42 42 default :
43 43 $downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::ISO);
... ...