Commit 82c83a3048a016eb4d96885cf98f3238ce5710dc
1 parent
58e288eb
Exists in
master
and in
98 other branches
erreur dans ce fichier !
Showing
1 changed file
with
7 additions
and
8 deletions
Show diff stats
php/RemoteDataCenter/ImpexParamManager.php
... | ... | @@ -338,12 +338,12 @@ class ImpexParamManager |
338 | 338 | $filesMgr->setFileName($localFile); |
339 | 339 | |
340 | 340 | $varInfo = $filesMgr->getCdfVarInfo($this->parameterKey); |
341 | - $varSampling = $filesMgr->getCdfSampling(); | |
341 | + $varSampling = $filesMgr->getCdfSampling(); | |
342 | 342 | |
343 | 343 | $res["param"]["info"]["realVar"] = $this->parameterKey; |
344 | 344 | $res["param"]["info"]["type"] = $varInfo['type']; |
345 | - $res["param"]["info"]["minSampling"] = $varSampling[2]; | |
346 | - $res["param"]["info"]["maxSampling"] = $varSampling[2]; | |
345 | + $res["param"]["info"]["minSampling"] = $varSampling[4]; | |
346 | + $res["param"]["info"]["maxSampling"] = $varSampling[4]; | |
347 | 347 | $res["param"]["info"]["plotType"] = "Spectro"; |
348 | 348 | $res["param"]["info"]["size"] = $varInfo['size']; |
349 | 349 | } |
... | ... | @@ -427,7 +427,7 @@ class ImpexParamManager |
427 | 427 | { |
428 | 428 | $params = array(); |
429 | 429 | |
430 | - if ($templateArgs && !empty((array) $templateArgs)) | |
430 | + if ($templateArgs) | |
431 | 431 | { |
432 | 432 | $extraParams = array(); |
433 | 433 | |
... | ... | @@ -449,17 +449,16 @@ class ImpexParamManager |
449 | 449 | if ($key == "Sampling") $params[$key] = 60; |
450 | 450 | } |
451 | 451 | } |
452 | - | |
452 | + | |
453 | 453 | if ($url_XYZ) |
454 | 454 | { |
455 | 455 | $params['url_XYZ'] = $url_XYZ; |
456 | 456 | } |
457 | - | |
457 | + | |
458 | 458 | $params['extraParams'] = $extraParams; |
459 | 459 | } |
460 | 460 | else |
461 | 461 | { |
462 | - | |
463 | 462 | $params['accessUrl'] = $this->impexParamInfo->getAccessUrl($this->resourceID); |
464 | 463 | } |
465 | 464 | |
... | ... | @@ -596,4 +595,4 @@ class ImpexParamManager |
596 | 595 | $this->baseManager->deleteViTotal($vi); |
597 | 596 | } |
598 | 597 | } |
599 | 598 | -} |
599 | +} | |
600 | 600 | \ No newline at end of file |
... | ... |