Commit 39bae1d7fcc718ea2613821071a28e2737e95f67
1 parent
06f00a57
Exists in
master
and in
95 other branches
Fix getStatus API
Showing
1 changed file
with
1 additions
and
29 deletions
Show diff stats
php/WebServices/WebServer.php
| @@ -595,35 +595,7 @@ class WebServer | @@ -595,35 +595,7 @@ class WebServer | ||
| 595 | } | 595 | } |
| 596 | catch (Exception $e) | 596 | catch (Exception $e) |
| 597 | { | 597 | { |
| 598 | - // after first getStatus() call process is deleted | ||
| 599 | - /*$obj = array('id' => $id); | ||
| 600 | - | ||
| 601 | - try | ||
| 602 | - { | ||
| 603 | - $res = $this->requestManager->runWSRequest($this->userID, $this->IPclient, FunctionTypeEnumClass::PROCESSDELETE, null, $id); | ||
| 604 | - } | ||
| 605 | - catch (Exception $e) | ||
| 606 | - { | ||
| 607 | - | ||
| 608 | - } | ||
| 609 | - | ||
| 610 | - $jobsManager = new WSJobsManagerClass(); | ||
| 611 | - | ||
| 612 | - try | ||
| 613 | - { | ||
| 614 | - $res = $jobsManager->getResultFromProcessId($id); | ||
| 615 | - if (!$res['success']) { | ||
| 616 | - $this->throwError("processError","Cannot retrieve process $id info"); | ||
| 617 | - } | ||
| 618 | - | ||
| 619 | - $resultTag = $this->isGetPlotRequest($res['result']) ? 'plotURL' : 'dataFileURLs'; | ||
| 620 | - | ||
| 621 | - return array('success' => true, 'status' => 'done', $resultTag => WSConfigClass::getUrl().$res['result']); | ||
| 622 | - } | ||
| 623 | - catch (Exception $e) | ||
| 624 | - { | ||
| 625 | - $this->throwError("getResultFromProcessIdError", "Exception detected : ".$e->getMessage()); | ||
| 626 | - }*/ | 598 | + $this->throwError("executionError", "Exception detected : ".$e->getMessage()); |
| 627 | } | 599 | } |
| 628 | 600 | ||
| 629 | if (!$res['success']) { | 601 | if (!$res['success']) { |