You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/08/03 20:15:21 UTC
[1/2] airavata-php-gateway git commit: change experiment data to
match with new experiment model
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master dd4b4bc27 -> 30a194c5a
change experiment data to match with new experiment model
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/bfd374c5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/bfd374c5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/bfd374c5
Branch: refs/heads/master
Commit: bfd374c551c1a81893632dcc5ec7b17dd85afa64
Parents: 6a84103
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Aug 3 14:14:48 2015 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Aug 3 14:14:48 2015 -0400
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 2 +-
app/libraries/ExperimentUtilities.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bfd374c5/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index 3f2fe95..7d1c3ed 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -192,7 +192,7 @@ class ExperimentController extends BaseController
if (isset($_GET['expId'])) {
$cloneId = ExperimentUtilities::clone_experiment($_GET['expId']);
$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);
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bfd374c5/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 5a216d6..e94ad06 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -398,7 +398,7 @@ class ExperimentUtilities
try {
//create new experiment to receive the clone
$experiment = Airavata::getExperiment(Session::get('authz-token'), $expId);
- $cloneId = Airavata::cloneExperiment(Session::get('authz-token'), $expId, 'Clone of ' . $experiment->name);
+ $cloneId = Airavata::cloneExperiment(Session::get('authz-token'), $expId, 'Clone of ' . $experiment->experimentName);
//updating the experiment inputs and output path
$experiment = Airavata::getExperiment(Session::get('authz-token'), $cloneId);
@@ -408,7 +408,7 @@ class ExperimentUtilities
$expPathConstant = 'file://' . Config::get('pga_config.airavata')['ssh-user'] . '@' . $hostName . ':' . Config::get('pga_config.airavata')['experiment-data-absolute-path'];
$outputDataDir = str_replace(Config::get('pga_config.airavata')['experiment-data-absolute-path'],
$expPathConstant, ExperimentUtilities::$experimentPath);
- $experiment->userConfigurationData->advanceOutputDataHandling->outputDataDir = $outputDataDir;
+ //$experiment->userConfigurationData->advanceOutputDataHandling->outputDataDir = $outputDataDir;
foreach ($experimentInputs as $experimentInput) {
if ($experimentInput->type == DataType::URI) {
[2/2] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by sh...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
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/30a194c5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/30a194c5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/30a194c5
Branch: refs/heads/master
Commit: 30a194c5a6762d69f547f14224c0475534996008
Parents: bfd374c dd4b4bc
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Aug 3 14:15:04 2015 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Aug 3 14:15:04 2015 -0400
----------------------------------------------------------------------
app/controllers/AdminController.php | 18 +-
app/libraries/AdminUtilities.php | 2 +-
app/libraries/Airavata/API/Airavata.php | 6475 ++++--------------
.../Model/AppCatalog/ComputeResource/Types.php | 49 +-
app/libraries/AppUtilities.php | 3 +-
app/libraries/ExperimentUtilities.php | 78 +-
app/libraries/ProjectUtilities.php | 10 +-
app/views/admin/manage-resources.blade.php | 4 +-
.../partials/experiment-container.blade.php | 4 +-
app/views/project/summary.blade.php | 58 +-
10 files changed, 1549 insertions(+), 5152 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/30a194c5/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------