CDPP / AMDA_Integration

Commit e4cf87dcec6fbf599e2b41b55d109a4187eda537

Authored by Elena.Budnik
1 parent ddb6bf06
Exists in master and in 66 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, livraison-akka, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

params with args processing

Showing 1 changed file with 52 additions and 14 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/StatisticsImpl/IHMInputOutputParamsStatisticsClass.php
  Diff comments   View file @e4cf87d
@@ -15,7 +15,11 @@ class IHMInputOutputParamsStatisticsClass extends IHMInputOutputParamsAbstractCl @@ -15,7 +15,11 @@ class IHMInputOutputParamsStatisticsClass extends IHMInputOutputParamsAbstractCl
15 protected function unmarshallRequest($input) 15 protected function unmarshallRequest($input)
16 { 16 {
17 /* 17 /*
18 - {"id":"","timesrc":"TimeTable","name":"test","created":null,"description":"first","objName":"","objFormat":"","folderId":"","nbIntervals":0,"cacheToken":"","parameter":[{"param":"imf_gsm","function":"min"},{"param":"imf_mag","function":"max"}],"timeTables":[{"id":"sharedtt_26"},{"id":"sharedtt_27"}],"leaf":true,"nodeType":"catalog"}]' 18 + {"id":"",
  19 + "timesrc":"TimeTable","name":"test",
  20 + "created":null,"description":"first","objName":"","objFormat":"","folderId":"","nbIntervals":0,"cacheToken":"",
  21 + "parameter":[{"param":"imf_gsm","function":"min","template_args":"{}"},{"param":"imf_mag","function":"max","template_args":"{}"}],
  22 + "timeTables":[{"id":"sharedtt_26"},{"id":"sharedtt_27"}],"leaf":true,"nodeType":"catalog"}]'
19 */ 23 */
20 $requestNode = $this->paramsData->addRequestNode(); 24 $requestNode = $this->paramsData->addRequestNode();
21 25
@@ -30,26 +34,60 @@ class IHMInputOutputParamsStatisticsClass extends IHMInputOutputParamsAbstractCl @@ -30,26 +34,60 @@ class IHMInputOutputParamsStatisticsClass extends IHMInputOutputParamsAbstractCl
30 $catalogNode->setTimeFormat(RequestOutputStatisticTimeFormatEnum::ISO); 34 $catalogNode->setTimeFormat(RequestOutputStatisticTimeFormatEnum::ISO);
31 $catalogNode->setFileFormat(RequestOutputStatisticFileFormatEnum::XML); 35 $catalogNode->setFileFormat(RequestOutputStatisticFileFormatEnum::XML);
32 36
33 - // parse parameters / functions array  
34 - foreach ($input->parameter as $obj) {  
35 - $paramFunctionAssociation[$obj->param][] = $obj->function;  
36 - }  
37 -  
38 - foreach ($paramFunctionAssociation as $param => $functions) { 37 + $paramTemplateArgs = array(count($input->parameter), count($input->parameter));
  38 + $paramTemplateIndex = array(count($input->parameter), count($input->parameter));
  39 +
  40 + // parse parameters / functions array
  41 + foreach ($input->parameter as $obj)
  42 + {
  43 + $paramFunctionAssociation[$obj->paramid][] = $obj->function;
  44 + // parse template args and indices for template params
  45 + $array = (array) $obj->template_args;
  46 + if (!empty ($array)) {
  47 + $paramTemplateArgs[$obj->paramid][$obj->function] = $obj->template_args;
  48 + if (($obj->{'dim1-index'} != '*') && ($obj->{'dim1-index'} != '')) {
  49 + $paramTemplateIndex[$obj->paramid][$obj->function] = $obj->{'dim1-index'};
  50 + }
  51 + }
  52 + }
39 53
40 - $paramInfo = $this->paramManager->addExistingParam($param, $this->paramsData);  
41 - $paramsNode->addParam($paramInfo['id']);  
42 - $outputParamNode = $catalogNode->addParam($paramInfo['id'],$paramInfo['indexes']);  
43 - foreach ($functions as $function) $outputParamNode->addFunction($function);  
44 - } 54 + foreach ($paramFunctionAssociation as $param => $functions)
  55 + {
  56 + // template parameter
  57 + if ($paramTemplateArgs[$param])
  58 + {
  59 + foreach ($functions as $function)
  60 + {
  61 + $templateArgs = $paramTemplateArgs[$param][$function];
  62 + $paramInfo = $this->paramManager->addExistingParam($param, $this->paramsData, $templateArgs);
  63 + $paramsNode->addParam($paramInfo['id']);
  64 + if ($paramTemplateIndex[$param][$function] != null)
  65 + {
  66 + $paramInfo['indexes'] = array();
  67 + $paramInfo['indexes'][] = $paramTemplateIndex[$param][$function];
  68 + }
  69 + $outputParamNode = $catalogNode->addParam($paramInfo['id'],$paramInfo['indexes']);
  70 + $outputParamNode->addFunction($function);
  71 + }
  72 + }
  73 + // normal parameter
  74 + else
  75 + {
  76 + $paramInfo = $this->paramManager->addExistingParam($param, $this->paramsData);
  77 + $paramsNode->addParam($paramInfo['id']);
  78 + $outputParamNode = $catalogNode->addParam($paramInfo['id'],$paramInfo['indexes']);
  79 +
  80 + foreach ($functions as $function)
  81 + $outputParamNode->addFunction($function);
  82 + }
  83 + }
45 84
46 $resultFile = "result_".$this->requestID; 85 $resultFile = "result_".$this->requestID;
47 $this->paramsData->addWaitingResult(STATISTICS_RESULT_FILE_KEY, $resultFile); 86 $this->paramsData->addWaitingResult(STATISTICS_RESULT_FILE_KEY, $resultFile);
48 -// 87 +
49 $postProcessCmd = "mv statistic-*"; 88 $postProcessCmd = "mv statistic-*";
50 $postProcessCmd .= " ".$resultFile.".xml"; 89 $postProcessCmd .= " ".$resultFile.".xml";
51 90
52 -//  
53 $this->paramsData->setPostCmd($postProcessCmd); 91 $this->paramsData->setPostCmd($postProcessCmd);
54 return $this->paramsData; 92 return $this->paramsData;
55 } 93 }