CDPP / AMDA_Integration

Commit c6b591d9718715d2f5d7ba7a10239e7ebc7c2f48

Authored by Nathanael Jourdane
1 parent 62786300
Exists in master and in 65 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, 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

Send runningPath to AMDA_IHM to activate wenservice batchmode

Showing 4 changed files with 29 additions and 8 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Process/IHMInputOutputRunningInfoProcessClass.php
  Diff comments   View file @c6b591d
... ... @@ -39,6 +39,8 @@ class IHMInputOutputRunningInfoProcessClass extends IHMInputOutputInfoProcessAbs
39 39 if (!$jobInfo['success'])
40 40 continue;
41 41  
  42 + $jobInfo['runningPath'] = $d->getRunningPath();
  43 +
42 44 switch ($jobInfo['status'])
43 45 {
44 46 case 'in_progress' :
... ...
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
  Diff comments   View file @c6b591d
... ... @@ -199,6 +199,12 @@ class IHMJobsManagerClass {
199 199 return $res;
200 200  
201 201 $job = $this->jobXml->getElementById($id);
  202 +
  203 + $attributes = [];
  204 + foreach( $job->attributes as $attrName => $attrNode) {
  205 + $attributes[$attrName] = $attrNode->nodeValue;
  206 + }
  207 +
202 208 $format = 'unknown';
203 209 $compression = 'unknown';
204 210 if($job)
... ...
src/Request/ProcessRequestImpl/ProcessRequestClass.php
  Diff comments   View file @c6b591d
... ... @@ -76,6 +76,8 @@ class ProcessRequestClass extends RequestAbstractClass
76 76 */
77 77 private function updateProcess($processInfo)
78 78 {
  79 + $this->requestData->setRunningPath($processInfo['runningpath']);
  80 +
79 81 $this->requestData->setId($processInfo['id']);
80 82 if ($processInfo['isrunning'])
81 83 $this->requestData->setStatus(ProcessStatusEnumClass::RUNNING);
... ...
src/Request/ProcessRequestImpl/ProcessRequestDataClass.php
  Diff comments   View file @c6b591d
... ... @@ -46,6 +46,7 @@ class ProcessRequestDataClass extends RequestDataClass
46 46 private $status = ProcessStatusEnumClass::UNKNOWN;
47 47 private $exitCode = 0;
48 48 private $start = 0;
  49 + private $runningPath = "";
49 50  
50 51 public function getManagerFilePath()
51 52 {
... ... @@ -107,6 +108,16 @@ class ProcessRequestDataClass extends RequestDataClass
107 108 $this->id = $id;
108 109 }
109 110  
  111 + public function getRunningPath()
  112 + {
  113 + return $this->runningPath;
  114 + }
  115 +
  116 + public function setRunningPath($runningPath)
  117 + {
  118 + $this->runningPath = $runningPath;
  119 + }
  120 +
110 121 public function getType()
111 122 {
112 123 return $this->type;
... ... @@ -117,14 +128,14 @@ class ProcessRequestDataClass extends RequestDataClass
117 128 $this->type = $type;
118 129 }
119 130  
120   - public function getBatchEnable()
121   - {
122   - return $this->batchEnable;
123   - }
124   -
125   - public function setBatchEnable($batchEnable)
126   - {
127   - $this->batchEnable = $batchEnable;
  131 + public function getBatchEnable()
  132 + {
  133 + return $this->batchEnable;
  134 + }
  135 +
  136 + public function setBatchEnable($batchEnable)
  137 + {
  138 + $this->batchEnable = $batchEnable;
128 139 }
129 140  
130 141 public function getStatus()
... ...