CDPP / AMDA_IHM

Commit a37ffa4400e0ce05ac4cf5e85111d85190864cf6

Authored by Myriam Bouchemit
2 parents ee279704 a8ed4da2
Exists in master and in 94 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, master_vge, mlplasmas, multiplot, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Showing 1 changed file with 9 additions and 5 deletions   Show diff stats
Inline Side-by-side
php/RemoteDataCenter/ImpexParamManager.php
  Diff comments   View file @a37ffa4
@@ -338,7 +338,7 @@ class ImpexParamManager @@ -338,7 +338,7 @@ class ImpexParamManager
338 $filesMgr->setFileName($localFile); 338 $filesMgr->setFileName($localFile);
339 339
340 $varInfo = $filesMgr->getCdfVarInfo($this->parameterKey); 340 $varInfo = $filesMgr->getCdfVarInfo($this->parameterKey);
341 - $varSampling = $filesMgr->getCdfSampling(); 341 + $varSampling = $filesMgr->getCdfSampling();
342 342
343 $res["param"]["info"]["realVar"] = $this->parameterKey; 343 $res["param"]["info"]["realVar"] = $this->parameterKey;
344 $res["param"]["info"]["type"] = $varInfo['type']; 344 $res["param"]["info"]["type"] = $varInfo['type'];
@@ -427,7 +427,12 @@ class ImpexParamManager @@ -427,7 +427,12 @@ class ImpexParamManager
427 { 427 {
428 $params = array(); 428 $params = array();
429 429
430 - if ($templateArgs && !empty((array) $templateArgs)) 430 + if ($templateArgs) {
  431 + $templateArr = (array)$templateArgs;
  432 + $notEmptyTemplateArgs = !empty($templateArr);
  433 + }
  434 +
  435 + if ($templateArgs && $notEmptyTemplateArgs)
431 { 436 {
432 $extraParams = array(); 437 $extraParams = array();
433 438
@@ -449,17 +454,16 @@ class ImpexParamManager @@ -449,17 +454,16 @@ class ImpexParamManager
449 if ($key == "Sampling") $params[$key] = 60; 454 if ($key == "Sampling") $params[$key] = 60;
450 } 455 }
451 } 456 }
452 - 457 +
453 if ($url_XYZ) 458 if ($url_XYZ)
454 { 459 {
455 $params['url_XYZ'] = $url_XYZ; 460 $params['url_XYZ'] = $url_XYZ;
456 } 461 }
457 - 462 +
458 $params['extraParams'] = $extraParams; 463 $params['extraParams'] = $extraParams;
459 } 464 }
460 else 465 else
461 { 466 {
462 -  
463 $params['accessUrl'] = $this->impexParamInfo->getAccessUrl($this->resourceID); 467 $params['accessUrl'] = $this->impexParamInfo->getAccessUrl($this->resourceID);
464 } 468 }
465 469