CDPP / AMDA_Integration

Commit 286f7924cdb2c750ae2eeb4d10bcb908c83acf27

Authored by Benjamin Renard
1 parent 69602cd7
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

Derived parameter compilation only after a modification

Showing 6 changed files with 21 additions and 8 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Config/IHMConfigClass.php
  Diff comments   View file @286f792
... ... @@ -78,6 +78,11 @@ class IHMConfigClass
78 78 {
79 79 return self::getUserWSPath().self::$userParamMgrFile;
80 80 }
  81 +
  82 + public static function getUserDerivedParamFilePath($paramId)
  83 + {
  84 + return self::getUserWSPath().$paramId.".xml";
  85 + }
81 86  
82 87 public static function getLocalParamDBPath()
83 88 {
... ...
src/InputOutput/IHMImpl/Params/DataMiningImpl/IHMInputOutputParamsDataMiningClass.php
  Diff comments   View file @286f792
... ... @@ -37,7 +37,7 @@ class IHMInputOutputParamsDataMiningClass extends IHMInputOutputParamsAbstractCl
37 37 //create a derived param for the expression
38 38 $this->paramManager->addProcessParam($paramId, $expressionInfo["expression"],
39 39 $expressionInfo['params'], $input->sampling,
40   - $input->gap,$this->paramsData);
  40 + $input->gap,time(),$this->paramsData);
41 41  
42 42 //add derived param to output
43 43 $paramsNode->addParam($paramId);
... ...
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
  Diff comments   View file @286f792
... ... @@ -34,9 +34,9 @@ class IHMParamManagerClass
34 34 /*
35 35 * @brief Add a process parameter
36 36 */
37   - public function addProcessParam($paramId,$expression,$params,$sampling,$gap,$paramsData)
  37 + public function addProcessParam($paramId,$expression,$params,$sampling,$gap,$dateModif,$paramsData)
38 38 {
39   - $paramsData->addProcessParamToCreate($paramId, $expression, $params, $sampling, $gap);
  39 + $paramsData->addProcessParamToCreate($paramId, $expression, $params, $sampling, $gap,$dateModif);
40 40  
41 41 foreach ($params as $param)
42 42 $this->addExistingParam($param,$paramsData);
... ... @@ -151,7 +151,7 @@ class IHMParamManagerClass
151 151 //create a process param for the derived parameter
152 152 $this->addProcessParam($paramId, $expressionInfo["expression"],
153 153 $expressionInfo['params'], $res["param"]["timestep"],
154   - 0,$paramsData);
  154 + 0,$res["param"]["dateModif"],$paramsData);
155 155  
156 156 return array("id" => $paramId, "indexes" => array(), "calib_infos" => array());
157 157 }
... ...
src/InputOutput/IHMImpl/Tools/IHMUserParamLoaderClass.php
  Diff comments   View file @286f792
... ... @@ -83,6 +83,9 @@ class IHMUserParamLoaderClass
83 83 //id
84 84 $paramId = $derivedParamNode->getAttribute(self::$mgrDerivedParamIdAtt);
85 85  
  86 + //modification date
  87 + $dateModif = filemtime(IHMConfigClass::getUserDerivedParamFilePath($paramId));
  88 +
86 89 //name
87 90 $paramName = $derivedParamNode->getAttribute(self::$mgrDerivedParamNameAtt);
88 91  
... ... @@ -97,7 +100,8 @@ class IHMUserParamLoaderClass
97 100 "name" => $paramName,
98 101 "expression" => $paramExpression,
99 102 "timestep" => $paramTimeStep,
100   - "info" => $this->loadDerivedParameterInfo($id)
  103 + "info" => $this->loadDerivedParameterInfo($id),
  104 + "dateModif" => $dateModif
101 105 ));
102 106 }
103 107 }
... ...
src/Request/ParamsRequestImpl/ParamsRequestClass.php
  Diff comments   View file @286f792
... ... @@ -82,6 +82,8 @@ class ParamsRequestClass extends ProcessRequestClass
82 82 $this->requestData->setLastErrorMessage('Cannot copy param definition file for '.$key);
83 83 return false;
84 84 }
  85 +
  86 + touch($destinationFile, filemtime($value));
85 87 }
86 88  
87 89 //create processed params files
... ... @@ -91,7 +93,7 @@ class ParamsRequestClass extends ProcessRequestClass
91 93 $doc->preserveWhiteSpace = false;
92 94 $doc->formatOutput = true;
93 95  
94   - if (!$xmlNode = $value->toXMLNode($doc))
  96 + if (!$xmlNode = $value["param"]->toXMLNode($doc))
95 97 {
96 98 $this->requestData->setLastErrorMessage('Cannot create params XML file for '.$key);
97 99 return false;
... ... @@ -111,6 +113,8 @@ class ParamsRequestClass extends ProcessRequestClass
111 113 $this->requestData->setLastErrorMessage('Cannot save params XML file for '.$key);
112 114 return false;
113 115 }
  116 +
  117 + touch($destinationFile, $value["dateModif"]);
114 118 }
115 119  
116 120 return true;
... ...
src/Request/ParamsRequestImpl/ParamsRequestDataClass.php
  Diff comments   View file @286f792
... ... @@ -59,7 +59,7 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
59 59 return $this->processParamsToCreate;
60 60 }
61 61  
62   - public function addProcessParamToCreate($paramId, $expression, $getParams, $sampling, $gap)
  62 + public function addProcessParamToCreate($paramId, $expression, $getParams, $sampling, $gap, $dateModif)
63 63 {
64 64 $newParam = new ParamNodeClass();
65 65 $newParam->setId($paramId);
... ... @@ -73,7 +73,7 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
73 73 }
74 74 $newParam->setProcess($expression);
75 75 $newParam->setOutput();
76   - $this->processParamsToCreate[$paramId] = $newParam;
  76 + $this->processParamsToCreate[$paramId] = array('param' => $newParam, 'dateModif' => $dateModif);
77 77 }
78 78 }
79 79  
... ...