From 4d4251dac77e5bc657c0456edd24d19e3bdc3cde Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Wed, 31 May 2017 15:57:52 +0200
Subject: [PATCH] modify request for downloadRequest : params - array of objects!
---
php/classes/WebServer.php | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/php/classes/WebServer.php b/php/classes/WebServer.php
index 02b098e..f20ea07 100644
--- a/php/classes/WebServer.php
+++ b/php/classes/WebServer.php
@@ -885,8 +885,11 @@ $vars["sampling"] = strtr($vars["sampling"], array($matches[1] => ""));
//Build parameter list
$params = array();
+ //TODO template arguments to implementer ?
foreach ($paramList['params'] as $paramId)
{
+ $param = new stdClass;
+
if (preg_match("#^ws_#",$paramId))
{
$res = $this->paramLoader->getDerivedParameterNameFromId($paramId);
@@ -895,7 +898,7 @@ $vars["sampling"] = strtr($vars["sampling"], array($matches[1] => ""));
if ($this->isSoap) throw new SoapFault("server02", 'Not available derived parameter '.$paramId);
else return array('success' => false, 'message' => 'Not available derived parameter '.$paramId);
}
- $params[] = "ws_".$res['name'];
+ $param->paramid = "ws_".$res['name'];
}
else if (preg_match("#^wsd_#",$paramId))
{
@@ -905,10 +908,14 @@ $vars["sampling"] = strtr($vars["sampling"], array($matches[1] => ""));
if ($this->isSoap) throw new SoapFault("server02", 'Not available user parameter '.$paramId);
else return array('success' => false, 'message' => 'Not available user parameter '.$paramId);
}
- $params[] = "wsd_".$res['name'];
+ $param->paramid = "wsd_".$res['name'];
}
else
- $params[] = $paramId;
+ {
+ $param->paramid = $paramId;
+ }
+
+ $params[] = $param;
}
$obj = (object)array(
--
libgit2 0.21.2