Commit 2dab1b1bf6cbe1ae6ee7b1cc62ceb8cb29af46b6
1 parent
e7dc265f
Exists in
master
and in
109 other branches
change input args order for addTask
Showing
2 changed files
with
8 additions
and
7 deletions
Show diff stats
php/classes/AmdaAction.php
| @@ -762,7 +762,7 @@ class AmdaAction | @@ -762,7 +762,7 @@ class AmdaAction | ||
| 762 | case 'myDataParam' : | 762 | case 'myDataParam' : |
| 763 | case 'derivedParam' : | 763 | case 'derivedParam' : |
| 764 | if ($obj->nodeType == 'derivedParam' && $this->amdaStat->success) | 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 | $objectMgr = new DerivedParamMgr($obj->nodeType); | 766 | $objectMgr = new DerivedParamMgr($obj->nodeType); |
| 767 | break; | 767 | break; |
| 768 | case 'timeTable' : | 768 | case 'timeTable' : |
| @@ -976,7 +976,7 @@ class AmdaAction | @@ -976,7 +976,7 @@ class AmdaAction | ||
| 976 | public function merge($obj) | 976 | public function merge($obj) |
| 977 | { | 977 | { |
| 978 | if ($this->amdaStat->success) | 978 | if ($this->amdaStat->success) |
| 979 | - $this->amdaStat->addTask('ttoper', $this->user, null); | 979 | + $this->amdaStat->addTask( $this->user, 'ttoper', null); |
| 980 | 980 | ||
| 981 | $objectMgr = new TimeTableMgr(); | 981 | $objectMgr = new TimeTableMgr(); |
| 982 | 982 | ||
| @@ -990,7 +990,7 @@ class AmdaAction | @@ -990,7 +990,7 @@ class AmdaAction | ||
| 990 | public function intersect($obj) | 990 | public function intersect($obj) |
| 991 | { | 991 | { |
| 992 | if ($this->amdaStat->success) | 992 | if ($this->amdaStat->success) |
| 993 | - $this->amdaStat->addTask('ttoper', $this->user, null); | 993 | + $this->amdaStat->addTask($this->user, 'ttoper', null); |
| 994 | 994 | ||
| 995 | $objectMgr = new TimeTableMgr(); | 995 | $objectMgr = new TimeTableMgr(); |
| 996 | $result = $objectMgr -> intersect($obj); | 996 | $result = $objectMgr -> intersect($obj); |
| @@ -1159,7 +1159,7 @@ class AmdaAction | @@ -1159,7 +1159,7 @@ class AmdaAction | ||
| 1159 | public function getHstImagesUrl($o) | 1159 | public function getHstImagesUrl($o) |
| 1160 | { | 1160 | { |
| 1161 | if ($this->amdaStat->success) | 1161 | if ($this->amdaStat->success) |
| 1162 | - $this->amdaStat->addTask('images', $this->user, null); | 1162 | + $this->amdaStat->addTask($this->user, 'images', null); |
| 1163 | 1163 | ||
| 1164 | $myHstMgr = new HstMgr(); | 1164 | $myHstMgr = new HstMgr(); |
| 1165 | $res = $myHstMgr->getImagesUrl($o->startTime, $o->stopTime, $o->planet); | 1165 | $res = $myHstMgr->getImagesUrl($o->startTime, $o->stopTime, $o->planet); |
| @@ -1171,7 +1171,7 @@ class AmdaAction | @@ -1171,7 +1171,7 @@ class AmdaAction | ||
| 1171 | public function getAPISImagesUrl($o) | 1171 | public function getAPISImagesUrl($o) |
| 1172 | { | 1172 | { |
| 1173 | if ($this->amdaStat->success) | 1173 | if ($this->amdaStat->success) |
| 1174 | - $this->amdaStat->addTask('images', $this->user, null); | 1174 | + $this->amdaStat->addTask($this->user, 'images', null); |
| 1175 | 1175 | ||
| 1176 | $apisMgr = new APISMgr(); | 1176 | $apisMgr = new APISMgr(); |
| 1177 | $res = $apisMgr->get($o->target, $o->startTime, $o->stopTime, $o->datasets); | 1177 | $res = $apisMgr->get($o->target, $o->startTime, $o->stopTime, $o->datasets); |
php/uploadFile.php
| @@ -372,8 +372,9 @@ | @@ -372,8 +372,9 @@ | ||
| 372 | { | 372 | { |
| 373 | $fileMgr = new FilesMgr(); | 373 | $fileMgr = new FilesMgr(); |
| 374 | $amdaStat = new AmdaStats($_POST['sessionID']); | 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 | // Time Table or Catalog | 379 | // Time Table or Catalog |
| 379 | else | 380 | else |