Repository: airavata-php-gateway Updated Branches: refs/heads/master 9663813fd -> 07b9301f0
Fixed issue with experiment creation Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/cf662a90 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/cf662a90 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/cf662a90 Branch: refs/heads/master Commit: cf662a90f06e7a1a6195087bbe8ce6549240d719 Parents: e97273b Author: Shameera Rathnayaka <[email protected]> Authored: Mon Jul 20 16:13:54 2015 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Mon Jul 20 16:13:54 2015 -0400 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 32 +++++++++++++-------------- app/libraries/ExperimentUtilities.php | 30 +++++++++++++------------ 2 files changed, 32 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cf662a90/app/controllers/ExperimentController.php ---------------------------------------------------------------------- diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php index b262ec3..142dfdd 100755 --- a/app/controllers/ExperimentController.php +++ b/app/controllers/ExperimentController.php @@ -78,11 +78,11 @@ class ExperimentController extends BaseController { $experiment = ExperimentUtilities::get_experiment($_GET['expId']); if ($experiment != null) { - $project = ProjectUtilities::get_project($experiment->projectID); + $project = ProjectUtilities::get_project($experiment->projectId); $expVal = ExperimentUtilities::get_experiment_values($experiment, $project); $expVal["jobState"] = ExperimentUtilities::get_job_status($experiment); - $jobDetails = ExperimentUtilities::get_job_details($experiment->experimentID); - $transferDetails = ExperimentUtilities::get_transfer_details($experiment->experimentID); + $jobDetails = ExperimentUtilities::get_job_details($experiment->experimentId); + $transferDetails = ExperimentUtilities::get_transfer_details($experiment->experimentId); //var_dump( $jobDetails); exit; // User should not clone or edit a failed experiment. Only create clones of it. if ($expVal["experimentStatusString"] == "FAILED") @@ -129,7 +129,7 @@ class ExperimentController extends BaseController { //var_dump( Input::all() ); exit; $experiment = ExperimentUtilities::get_experiment(Input::get('expId')); - $project = ProjectUtilities::get_project($experiment->projectID); + $project = ProjectUtilities::get_project($experiment->projectId); $expVal = ExperimentUtilities::get_experiment_values($experiment, $project); $expVal["jobState"] = ExperimentUtilities::get_job_status($experiment); @@ -137,24 +137,24 @@ class ExperimentController extends BaseController { $updatedExperiment = CommonUtilities::apply_changes_to_experiment($experiment); - CommonUtilities::update_experiment($experiment->experimentID, $updatedExperiment); + CommonUtilities::update_experiment($experiment->experimentId, $updatedExperiment); }*/ if (isset($_POST['launch'])) { - ExperimentUtilities::launch_experiment($experiment->experimentID); - return Redirect::to('experiment/summary?expId=' . $experiment->experimentID); + ExperimentUtilities::launch_experiment($experiment->experimentId); + return Redirect::to('experiment/summary?expId=' . $experiment->experimentId); } elseif (isset($_POST['clone'])) { - $cloneId = ExperimentUtilities::clone_experiment($experiment->experimentID); + $cloneId = ExperimentUtilities::clone_experiment($experiment->experimentId); $experiment = ExperimentUtilities::get_experiment($cloneId); - $project = ProjectUtilities::get_project($experiment->projectID); + $project = ProjectUtilities::get_project($experiment->projectId); $expVal = ExperimentUtilities::get_experiment_values($experiment, $project); $expVal["jobState"] = ExperimentUtilities::get_job_status($experiment); - return Redirect::to('experiment/edit?expId=' . $experiment->experimentID); + return Redirect::to('experiment/edit?expId=' . $experiment->experimentId); } elseif (isset($_POST['cancel'])) { - ExperimentUtilities::cancel_experiment($experiment->experimentID); - return Redirect::to('experiment/summary?expId=' . $experiment->experimentID); + ExperimentUtilities::cancel_experiment($experiment->experimentId); + return Redirect::to('experiment/summary?expId=' . $experiment->experimentId); } } @@ -168,7 +168,7 @@ class ExperimentController extends BaseController ); $experiment = ExperimentUtilities::get_experiment($_GET['expId']); - $project = ProjectUtilities::get_project($experiment->projectID); + $project = ProjectUtilities::get_project($experiment->projectId); $expVal = ExperimentUtilities::get_experiment_values($experiment, $project); $expVal["jobState"] = ExperimentUtilities::get_job_status($experiment); @@ -203,16 +203,16 @@ class ExperimentController extends BaseController $experiment = ExperimentUtilities::get_experiment(Input::get('expId')); // update local experiment variable $updatedExperiment = ExperimentUtilities::apply_changes_to_experiment($experiment, Input::all()); - ExperimentUtilities::update_experiment($experiment->experimentID, $updatedExperiment); + ExperimentUtilities::update_experiment($experiment->experimentId, $updatedExperiment); if (isset($_POST['save'])) { $experiment = ExperimentUtilities::get_experiment(Input::get('expId')); // update local experiment variable } if (isset($_POST['launch'])) { - ExperimentUtilities::launch_experiment($experiment->experimentID); + ExperimentUtilities::launch_experiment($experiment->experimentId); } - return Redirect::to('experiment/summary?expId=' . $experiment->experimentID); + return Redirect::to('experiment/summary?expId=' . $experiment->experimentId); } else return View::make("home"); } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cf662a90/app/libraries/ExperimentUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php index 003bc20..676db0a 100644 --- a/app/libraries/ExperimentUtilities.php +++ b/app/libraries/ExperimentUtilities.php @@ -160,25 +160,27 @@ class ExperimentUtilities ExperimentUtilities::create_experiment_folder_path(); } - $advHandling = new AdvancedOutputDataHandling(); +// $advHandling = new AdvancedOutputDataHandling(); $hostName = $_SERVER['SERVER_NAME']; $expPathConstant = 'file://' . ExperimentUtilities::$sshUser . '@' . $hostName . ':' . Config::get('pga_config.airavata')['experiment-data-absolute-path']; - $advHandling->outputDataDir = str_replace(Config::get('pga_config.airavata')['experiment-data-absolute-path'], - $expPathConstant, ExperimentUtilities::$experimentPath); - $userConfigData->advanceOutputDataHandling = $advHandling; +// $advHandling->outputDataDir = str_replace(Config::get('pga_config.airavata')['experiment-data-absolute-path'], +// $expPathConstant, ExperimentUtilities::$experimentPath); +// $userConfigData->advanceOutputDataHandling = $advHandling; //TODO: replace constructor with a call to airvata to get a prepopulated experiment template - $experiment = new Experiment(); + $experiment = new ExperimentModel(); // required - $experiment->projectID = $_POST['project']; + $experiment->projectId = $_POST['project']; $experiment->userName = Session::get('username'); $experiment->name = $_POST['experiment-name']; + $experiment->gatewayId = "default"; + $experiment->experimentName = $_POST['experiment-name']; // optional $experiment->description = $_POST['experiment-description']; - $experiment->applicationId = $_POST['application']; + $experiment->executionId = $_POST['application']; $experiment->userConfigurationData = $userConfigData; $experiment->experimentInputs = $experimentInputs; if (isset($_POST["enableEmailNotification"])) { @@ -609,7 +611,7 @@ class ExperimentUtilities if ($experiment->experimentStatus != null) { $experimentStatus = $experiment->experimentStatus; - $experimentState = $experimentStatus->experimentState; + $experimentState = $experimentStatus->state; $experimentStatusString = ExperimentState::$__names[$experimentState]; $expVal["experimentStatusString"] = $experimentStatusString; $expVal["experimentTimeOfStateChange"] = $experimentStatus->timeOfStateChange / 1000; // divide by 1000 since timeOfStateChange is in ms @@ -627,7 +629,7 @@ class ExperimentUtilities $expVal["computeResource"] = ""; } } - $expVal["applicationInterface"] = AppUtilities::get_application_interface($experiment->applicationId); + $expVal["applicationInterface"] = AppUtilities::get_application_interface($experiment->executionId); switch ($experimentStatusString) { @@ -766,7 +768,7 @@ class ExperimentUtilities $expContainer = array(); $expNum = 0; foreach ($experiments as $experiment) { - $expValue = ExperimentUtilities::get_experiment_values($experiment, ProjectUtilities::get_project($experiment->projectID), true); + $expValue = ExperimentUtilities::get_experiment_values($experiment, ProjectUtilities::get_project($experiment->projectId), true); $expContainer[$expNum]['experiment'] = $experiment; if ($expValue["experimentStatusString"] == "FAILED") $expValue["editable"] = false; @@ -823,7 +825,7 @@ class ExperimentUtilities $expContainer = array(); $expNum = 0; foreach ($experiments as $experiment) { - $expValue = ExperimentUtilities::get_experiment_values($experiment, ProjectUtilities::get_project($experiment->projectID), true); + $expValue = ExperimentUtilities::get_experiment_values($experiment, ProjectUtilities::get_project($experiment->projectId), true); $expContainer[$expNum]['experiment'] = $experiment; if ($expValue["experimentStatusString"] == "FAILED") $expValue["editable"] = false; @@ -869,7 +871,7 @@ class ExperimentUtilities $expContainer = array(); $expNum = 0; foreach ($experiments as $experiment) { - $expValue = ExperimentUtilities::get_experiment_values($experiment, ProjectUtilities::get_project($experiment->projectID), true); + $expValue = ExperimentUtilities::get_experiment_values($experiment, ProjectUtilities::get_project($experiment->projectId), true); $expContainer[$expNum]['experiment'] = $experiment; if ($expValue["experimentStatusString"] == "FAILED") $expValue["editable"] = false; @@ -901,7 +903,7 @@ class ExperimentUtilities { $experiment->name = $input['experiment-name']; $experiment->description = rtrim($input['experiment-description']); - $experiment->projectID = $input['project']; + $experiment->projectId = $input['project']; //$experiment->applicationId = $_POST['application']; $userConfigDataUpdated = $experiment->userConfigurationData; @@ -938,7 +940,7 @@ class ExperimentUtilities $experiment->userConfigurationData = $userConfigDataUpdated; - $applicationInputs = AppUtilities::get_application_inputs($experiment->applicationId); + $applicationInputs = AppUtilities::get_application_inputs($experiment->executionId); $experimentInputs = $experiment->experimentInputs; // get current inputs //var_dump($experimentInputs);
