CDPP / AMDA_IHM

Commit 4d4251dac77e5bc657c0456edd24d19e3bdc3cde

Authored by Elena.Budnik
1 parent 4d1e1e01
Exists in master and in 112 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, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

modify request for downloadRequest : params - array of objects!

Showing 1 changed file with 10 additions and 3 deletions   Show diff stats
Inline Side-by-side
php/classes/WebServer.php
  Diff comments   View file @4d4251d
... ... @@ -885,8 +885,11 @@ $vars["sampling"] = strtr($vars["sampling"], array($matches[1] => ""));
885 885 //Build parameter list
886 886 $params = array();
887 887  
  888 + //TODO template arguments to implementer ?
888 889 foreach ($paramList['params'] as $paramId)
889 890 {
  891 + $param = new stdClass;
  892 +
890 893 if (preg_match("#^ws_#",$paramId))
891 894 {
892 895 $res = $this->paramLoader->getDerivedParameterNameFromId($paramId);
... ... @@ -895,7 +898,7 @@ $vars["sampling"] = strtr($vars["sampling"], array($matches[1] => ""));
895 898 if ($this->isSoap) throw new SoapFault("server02", 'Not available derived parameter '.$paramId);
896 899 else return array('success' => false, 'message' => 'Not available derived parameter '.$paramId);
897 900 }
898   - $params[] = "ws_".$res['name'];
  901 + $param->paramid = "ws_".$res['name'];
899 902 }
900 903 else if (preg_match("#^wsd_#",$paramId))
901 904 {
... ... @@ -905,10 +908,14 @@ $vars["sampling"] = strtr($vars["sampling"], array($matches[1] => ""));
905 908 if ($this->isSoap) throw new SoapFault("server02", 'Not available user parameter '.$paramId);
906 909 else return array('success' => false, 'message' => 'Not available user parameter '.$paramId);
907 910 }
908   - $params[] = "wsd_".$res['name'];
  911 + $param->paramid = "wsd_".$res['name'];
909 912 }
910 913 else
911   - $params[] = $paramId;
  914 + {
  915 + $param->paramid = $paramId;
  916 + }
  917 +
  918 + $params[] = $param;
912 919 }
913 920  
914 921 $obj = (object)array(
... ...