CDPP / AMDA_Integration

Commit 3a9a18bf4b8229f1ba4e6d4178efa26395646e01

Authored by Benjamin Renard
2 parents f822811a 8c356a3d
Exists in master and in 63 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, 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, ws_get_catalog

Merge remote branch 'origin/master' into akka-scatter-multi-xparams

Showing 4 changed files with 49 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php
  Diff comments   View file @3a9a18b
... ... @@ -209,6 +209,7 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
209 209 $this->paramsData->setCompilationPath(IHMConfigClass::getCompilationPath());
210 210 $this->paramsData->setLocalBasePath(IHMConfigClass::getLocalBasePath());
211 211 $this->paramsData->setManagerFilePath(IHMConfigClass::getProcessManagerFilePath());
  212 + $this->paramsData->setTask($input->nodeType);
212 213 $this->input = $input;
213 214  
214 215 return $this->unmarshallRequest($input);
... ...
src/Request/ParamInfoRequestClass.php
  Diff comments   View file @3a9a18b
... ... @@ -63,7 +63,7 @@ class ParamInfoRequestClass extends RequestAbstractClass
63 63 switch ($this->requestData->getType()) {
64 64 case ParamInfoTypeEnumClass::IMPEXPLOTINIT :
65 65 case ParamInfoTypeEnumClass::PLOTINIT :
66   - $this->runFromParamFile($dom);
  66 + $this->runFromParamFile($dom);
67 67 break;
68 68 case ParamInfoTypeEnumClass::PARAMINFO :
69 69 $this->runFromParamInfoFile($dom);
... ... @@ -76,7 +76,7 @@ class ParamInfoRequestClass extends RequestAbstractClass
76 76 //Use some internal info - Nothing to do
77 77 $this->requestData->setSuccess(true);
78 78 }
79   -
  79 +
80 80 return $this->requestData->getSuccess();
81 81 }
82 82  
... ...
src/Request/ParamsRequestImpl/ParamsRequestClass.php
  Diff comments   View file @3a9a18b
... ... @@ -118,6 +118,21 @@ class ParamsRequestClass extends ProcessRequestClass
118 118 $this->requestData->setLastErrorMessage('Cannot copy param definition file for '.$key);
119 119 return false;
120 120 }
  121 + // get datasetID for statistics
  122 + $doc = new DOMDocument("1.0", "UTF-8");
  123 + if (@$doc->load($value)) {
  124 + $dsID = $doc->getElementsByTagName('dataset_id');
  125 + if ($dsID->length > 0) {
  126 + if ($dsID->item(0)->nodeValue)
  127 + $dsName = $dsID->item(0)->nodeValue;
  128 + elseif (strpos($key, 'spase_') !== false)
  129 + $dsName = 'impex';
  130 + else
  131 + $dsName = 'unknown';
  132 +
  133 + $this->requestData->addDatasetForStat($dsName);
  134 + }
  135 + }
121 136  
122 137 touch($destinationFile, filemtime($value));
123 138 }
... ... @@ -160,6 +175,7 @@ class ParamsRequestClass extends ProcessRequestClass
160 175 $doc->preserveWhiteSpace = false;
161 176 $doc->formatOutput = true;
162 177  
  178 +
163 179 if (!$xmlNode = $value["param"]->toXMLNode($doc))
164 180 {
165 181 $this->requestData->setLastErrorMessage('Cannot create params XML file for '.$key);
... ... @@ -175,6 +191,8 @@ class ParamsRequestClass extends ProcessRequestClass
175 191 return false;
176 192 }
177 193  
  194 + $this->requestData->addDatasetForStat('uploadedData');
  195 +
178 196 touch($destinationFile, $value["dateModif"]);
179 197 }
180 198 //create and copy local params files
... ... @@ -211,6 +229,11 @@ class ParamsRequestClass extends ProcessRequestClass
211 229 */
212 230 public function run()
213 231 {
  232 + $amdaStat = new AmdaStats(IHMConfigClass::getUserName());
  233 +
  234 + if (count($this->requestData->getDatasetForStat()) > 0)
  235 + $amdaStat->addTask(IHMConfigClass::getUserName(), $this->requestData->getTask(), $this->requestData->getDatasetForStat());
  236 +
214 237 return parent::run();
215 238 }
216 239  
... ...
src/Request/ParamsRequestImpl/ParamsRequestDataClass.php
  Diff comments   View file @3a9a18b
... ... @@ -29,6 +29,8 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
29 29 private $localParamsToCreateAndCopy = array();
30 30 private $paramsToCopy = array();
31 31 private $paramId = "";
  32 + private $datasetId = array();
  33 + private $task = "";
32 34  
33 35 function __construct()
34 36 {
... ... @@ -65,6 +67,16 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
65 67 $this->requestType = $requestType;
66 68 }
67 69  
  70 + public function getTask()
  71 + {
  72 + return $this->task;
  73 + }
  74 +
  75 + public function setTask($task)
  76 + {
  77 + $this->task = $task;
  78 + }
  79 +
68 80 public function addRequestNode()
69 81 {
70 82 $newRequestNode = new RequestNodeClass();
... ... @@ -116,7 +128,17 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
116 128 {
117 129 return $this->processParamsToCreate;
118 130 }
119   -
  131 +
  132 + public function getDatasetForStat()
  133 + {
  134 + return $this->datasetId;
  135 + }
  136 +
  137 + public function addDatasetForStat($dsId)
  138 + {
  139 + $this->datasetId[] = $dsId;
  140 + }
  141 +
120 142 public function addProcessParamToCreate($paramId, $expression, $expression_info, $getParams, $sampling, $gap, $dateModif, $units, $ytitle)
121 143 {
122 144 $newParam = new ParamNodeClass();
... ...