CDPP / AMDA_IHM

Commit 2dab1b1bf6cbe1ae6ee7b1cc62ceb8cb29af46b6

Authored by Elena.Budnik
1 parent e7dc265f
Exists in master and in 109 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, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, 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

change input args order for addTask

Showing 2 changed files with 8 additions and 7 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @2dab1b1
... ... @@ -762,7 +762,7 @@ class AmdaAction
762 762 case 'myDataParam' :
763 763 case 'derivedParam' :
764 764 if ($obj->nodeType == 'derivedParam' && $this->amdaStat->success)
765   - $this->amdaStat->addTask('create', $this->user, null);
  765 + $this->amdaStat->addTask($this->user, 'create', null);
766 766 $objectMgr = new DerivedParamMgr($obj->nodeType);
767 767 break;
768 768 case 'timeTable' :
... ... @@ -976,7 +976,7 @@ class AmdaAction
976 976 public function merge($obj)
977 977 {
978 978 if ($this->amdaStat->success)
979   - $this->amdaStat->addTask('ttoper', $this->user, null);
  979 + $this->amdaStat->addTask( $this->user, 'ttoper', null);
980 980  
981 981 $objectMgr = new TimeTableMgr();
982 982  
... ... @@ -990,7 +990,7 @@ class AmdaAction
990 990 public function intersect($obj)
991 991 {
992 992 if ($this->amdaStat->success)
993   - $this->amdaStat->addTask('ttoper', $this->user, null);
  993 + $this->amdaStat->addTask($this->user, 'ttoper', null);
994 994  
995 995 $objectMgr = new TimeTableMgr();
996 996 $result = $objectMgr -> intersect($obj);
... ... @@ -1159,7 +1159,7 @@ class AmdaAction
1159 1159 public function getHstImagesUrl($o)
1160 1160 {
1161 1161 if ($this->amdaStat->success)
1162   - $this->amdaStat->addTask('images', $this->user, null);
  1162 + $this->amdaStat->addTask($this->user, 'images', null);
1163 1163  
1164 1164 $myHstMgr = new HstMgr();
1165 1165 $res = $myHstMgr->getImagesUrl($o->startTime, $o->stopTime, $o->planet);
... ... @@ -1171,7 +1171,7 @@ class AmdaAction
1171 1171 public function getAPISImagesUrl($o)
1172 1172 {
1173 1173 if ($this->amdaStat->success)
1174   - $this->amdaStat->addTask('images', $this->user, null);
  1174 + $this->amdaStat->addTask($this->user, 'images', null);
1175 1175  
1176 1176 $apisMgr = new APISMgr();
1177 1177 $res = $apisMgr->get($o->target, $o->startTime, $o->stopTime, $o->datasets);
... ...
php/uploadFile.php
  Diff comments   View file @2dab1b1
... ... @@ -372,8 +372,9 @@
372 372 {
373 373 $fileMgr = new FilesMgr();
374 374 $amdaStat = new AmdaStats($_POST['sessionID']);
375   - if ($amdaStat->success)
376   - $amdaStat->addTask('upload', $_POST['sessionID'], null);
  375 + if ($amdaStat->success) {
  376 + $amdaStat->addTask( $_POST['sessionID'], 'upload', null);
  377 + }
377 378 }
378 379 // Time Table or Catalog
379 380 else
... ...