airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata-php-gateway git commit: fixing bug
Date Wed, 06 Jul 2016 18:20:12 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop 8ddd716d8 -> 6838d6ab8


fixing bug


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/6838d6ab
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6838d6ab
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6838d6ab

Branch: refs/heads/develop
Commit: 6838d6ab8c1b06969ee67df10750897e691530f5
Parents: 8ddd716
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Wed Jul 6 14:20:07 2016 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Wed Jul 6 14:20:07 2016 -0400

----------------------------------------------------------------------
 app/libraries/ExperimentUtilities.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6838d6ab/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 68f711a..1cacbf6 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -328,14 +328,17 @@ class ExperimentUtilities
         $experimentAssemblySuccessful = true;
         $newExperimentInputs = array();
 
-        if (sizeof($_FILES) > 0) {
-            if (ExperimentUtilities::file_upload_successful()) {
-                // construct unique path
-                ExperimentUtilities::create_experiment_folder_path($projectId, $experimentName);
-            } else {
-                $experimentAssemblySuccessful = false;
-            }
+        if (ExperimentUtilities::$experimentPath == null) {
+            ExperimentUtilities::create_experiment_folder_path($projectId, $experimentName);
         }
+//        if (sizeof($_FILES) > 0) {
+//            if (ExperimentUtilities::file_upload_successful()) {
+//                // construct unique path
+//                ExperimentUtilities::create_experiment_folder_path($projectId, $experimentName);
+//            } else {
+//                $experimentAssemblySuccessful = false;
+//            }
+//        }
 
         //sending application inputs in the order defined by the admins.
         $order = array();
@@ -585,7 +588,10 @@ class ExperimentUtilities
             //updating the experiment inputs and output path
             $experiment = Airavata::getExperiment(Session::get('authz-token'), $cloneId);
             $experimentInputs = $experiment->experimentInputs;
-            ExperimentUtilities::create_experiment_folder_path($experiment->projectId,
$experiment->experimentName);
+
+            if (ExperimentUtilities::$experimentPath == null) {
+                ExperimentUtilities::create_experiment_folder_path($experiment->projectId,
$experiment->experimentName);
+            }
 
             $hostName = $_SERVER['SERVER_NAME'];
 


Mime
View raw message