You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/07/15 18:47:54 UTC
[1/4] airavata-php-gateway git commit: fixing AIRAVATA-1767
Repository: airavata-php-gateway
Updated Branches:
refs/heads/0.15-release-branch 77c835d7e -> 1a6fa4b46
fixing AIRAVATA-1767
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/440712ef
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/440712ef
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/440712ef
Branch: refs/heads/0.15-release-branch
Commit: 440712ef4052e2f4883b75206f907febca8dc80e
Parents: 77c835d
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jul 15 19:22:02 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jul 15 19:22:02 2015 +0530
----------------------------------------------------------------------
app/libraries/CommonUtilities.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/440712ef/app/libraries/CommonUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php
index edc9ae1..b66b1b4 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -192,8 +192,8 @@ class CommonUtilities
}
if (Session::has("admin"))
echo '<li><a href="' . URL::to("/") . '/admin/dashboard"><span class="glyphicon glyphicon-user"></span>Admin Dashboard</a></li>';
- else
- echo '<li><a href="' . URL::to("/") . '/user/profile"><span class="glyphicon glyphicon-user"></span> Profile</a></li>';
+// else
+// echo '<li><a href="' . URL::to("/") . '/user/profile"><span class="glyphicon glyphicon-user"></span> Profile</a></li>';
echo '<li class="dropdown ' . $active . '">
[2/4] airavata-php-gateway git commit: changing Time to Creation Time
Posted by sc...@apache.org.
changing Time to Creation Time
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/e091358f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e091358f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e091358f
Branch: refs/heads/0.15-release-branch
Commit: e091358f38d9341fb5a9e761179c7493a2354d88
Parents: 440712e
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jul 15 19:41:58 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jul 15 19:41:58 2015 +0530
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 3 +++
app/views/project/summary.blade.php | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e091358f/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index ea3def9..344b58d 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -400,6 +400,9 @@ class ExperimentUtilities
//create new experiment to receive the clone
$experiment = Airavata::getExperiment($expId);
+ //Fixme - Input Files Dir
+
+
$cloneId = Airavata::cloneExperiment($expId, 'Clone of ' . $experiment->name);
CommonUtilities::print_success_message("<p>Experiment cloned!</p>" .
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e091358f/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
index 5fd323b..eeadf22 100755
--- a/app/views/project/summary.blade.php
+++ b/app/views/project/summary.blade.php
@@ -37,7 +37,7 @@
echo '<th>Name</th>';
echo '<th>Application</th>';
echo '<th>Compute Resource</th>';
- echo '<th>Time</th>';
+ echo '<th>Creation Time</th>';
echo '<th>Experiment Status</th>';
echo '<th>Job Status</th>';
[3/4] airavata-php-gateway git commit: changing Creation Time to Last
Modified Time
Posted by sc...@apache.org.
changing Creation Time to Last Modified Time
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/2b059202
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2b059202
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2b059202
Branch: refs/heads/0.15-release-branch
Commit: 2b0592023fb81565bf8ca0eccb95207ed3dd1a9f
Parents: e091358
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jul 15 19:46:34 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jul 15 19:46:34 2015 +0530
----------------------------------------------------------------------
app/views/project/summary.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2b059202/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
index eeadf22..1340f01 100755
--- a/app/views/project/summary.blade.php
+++ b/app/views/project/summary.blade.php
@@ -37,7 +37,7 @@
echo '<th>Name</th>';
echo '<th>Application</th>';
echo '<th>Compute Resource</th>';
- echo '<th>Creation Time</th>';
+ echo '<th>Last Modified Time</th>';
echo '<th>Experiment Status</th>';
echo '<th>Job Status</th>';
[4/4] airavata-php-gateway git commit: fixing AIRAVATA-1773
Posted by sc...@apache.org.
fixing AIRAVATA-1773
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/1a6fa4b4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1a6fa4b4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1a6fa4b4
Branch: refs/heads/0.15-release-branch
Commit: 1a6fa4b467a4345813e8f2c2947ccd4ef22d3b75
Parents: 2b05920
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jul 15 22:17:17 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jul 15 22:17:17 2015 +0530
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 31 ++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1a6fa4b4/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 344b58d..ff61473 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -399,16 +399,31 @@ class ExperimentUtilities
try {
//create new experiment to receive the clone
$experiment = Airavata::getExperiment($expId);
-
- //Fixme - Input Files Dir
-
-
$cloneId = Airavata::cloneExperiment($expId, 'Clone of ' . $experiment->name);
- CommonUtilities::print_success_message("<p>Experiment cloned!</p>" .
- '<p>You will be redirected to the edit page shortly, or you can
- <a href="edit_experiment.php?expId=' . $cloneId . '">go directly</a> to the edit experiment page.</p>');
- //redirect('edit_experiment.php?expId=' . $cloneId);
+ //updating the experiment inputs and output path
+ $experiment = Airavata::getExperiment($cloneId);
+ $experimentInputs = $experiment->experimentInputs;
+ ExperimentUtilities::create_experiment_folder_path();
+ $hostName = $_SERVER['SERVER_NAME'];
+ $expPathConstant = 'file://' . ExperimentUtilities::$sshUser . '@' . $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;
+
+ foreach ($experimentInputs as $experimentInput) {
+ if ($experimentInput->type == DataType::URI) {
+ $currentInputPath = $experimentInput->value;
+ $hostPathConstant = 'file://' . ExperimentUtilities::$sshUser . '@' . $hostName . ':';
+ $currentInputPath = str_replace($hostPathConstant, '', $currentInputPath);
+ $parts = explode('/', rtrim($currentInputPath, '/'));
+ $fileName = array_pop($parts);
+ $newInputPath = ExperimentUtilities::$experimentPath . $fileName;
+ copy($currentInputPath, $newInputPath);
+ $experimentInput->value = $hostPathConstant . $newInputPath;
+ }
+ }
+ Airavata::updateExperiment($cloneId, $experiment);
return $cloneId;
} catch (InvalidRequestException $ire) {
CommonUtilities::print_error_message('<p>There was a problem cloning the experiment.