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

Myriam Bouchemit
2 parents ee279704 a8ed4da2
Showing 1 changed file with 9 additions and 5 deletions Show diff stats
php/RemoteDataCenter/ImpexParamManager.php
@@ -338,7 +338,7 @@ class ImpexParamManager
 			$filesMgr->setFileName($localFile);
  
 			$varInfo = $filesMgr->getCdfVarInfo($this->parameterKey);
-            $varSampling = $filesMgr->getCdfSampling();
+		   $varSampling = $filesMgr->getCdfSampling();
  
 			$res["param"]["info"]["realVar"] = $this->parameterKey;
 			$res["param"]["info"]["type"] = $varInfo['type'];
@@ -427,7 +427,12 @@ class ImpexParamManager
 	{ 
 		$params = array();
  
-		if ($templateArgs && !empty((array) $templateArgs))
+		if ($templateArgs) {
+            $templateArr = (array)$templateArgs;
+            $notEmptyTemplateArgs = !empty($templateArr);
+		}
+		
+		if ($templateArgs && $notEmptyTemplateArgs)
 		{
 			$extraParams = array();
  
@@ -449,17 +454,16 @@ class ImpexParamManager
 					if ($key == "Sampling") $params[$key] = 60;
 				}
 			}
-		 		
+			
 			if ($url_XYZ)
 			{
 				$params['url_XYZ'] = $url_XYZ;
 			}
-			
+			 
 			$params['extraParams'] = $extraParams;				  
 		}
 		else 
 		{
-		 	
 			$params['accessUrl'] = $this->impexParamInfo->getAccessUrl($this->resourceID);
 		}