Merge branch 'issue#129' into 'master'

Merge branch issue#129 with master

See merge request !56

workflows/switch_project_space_id/__init__.py

@@ -65,10 +65,6 @@ class SwitchProjectSpaceId (BasicNG6Workflow):
                 logging.getLogger("SwitchProjectSpaceId.process").error("Error while searching space_id '" + str(self.space_id) + "' in application.properties, it certainly doesn't exist. \n" + str(err))
                 raise Exception("Error while searching space_id '" + str(self.space_id) + "' in application.properties, it certainly doesn't exist. \n" + str(err))
             
-            #Update to the projcet's space_id
-            t3mysql = t3MySQLdb()
-            project.update_space_id(self.space_id)
-            
             base_path = ng6conf.get_save_directory()
             
             #Process for the project's runs
@@ -83,7 +79,6 @@ class SwitchProjectSpaceId (BasicNG6Workflow):
                 #Update the directory in DB
                 new_run_directory = run.get_directory()
                 new_run_directory = new_run_directory.replace(old_directory, new_directory)
-                run.set_directory(new_run_directory)
                 
                 #Moving the files
                 #if not os.path.isdir(path_new_run_directory) :
@@ -103,7 +98,8 @@ class SwitchProjectSpaceId (BasicNG6Workflow):
                 #Update the retention in DB
                 old_retention = run.get_creation_date()
                 new_retention = ng6conf.compute_new_retention_date(self.space_id,old_retention)
-                run.set_retention(new_retention)                
+                run.set_retention(new_retention)
+                run.set_directory(new_run_directory)                
                 
             #Process for the project's analyzes
             analyzes_ids = project.get_project_analyzes_ids()
@@ -117,7 +113,6 @@ class SwitchProjectSpaceId (BasicNG6Workflow):
                 #Update the directory in DB
                 new_analysis_directory = analysis.get_directory()
                 new_analysis_directory = new_analysis_directory.replace(old_directory, new_directory)
-                analysis.set_directory(new_analysis_directory)
                 
                 #Moving the files
                 #if not os.path.isdir(path_new_analysis_directory) :
@@ -138,6 +133,7 @@ class SwitchProjectSpaceId (BasicNG6Workflow):
                 old_retention = analysis.get_creation_date()
                 new_retention = ng6conf.compute_new_retention_date(self.space_id,old_retention)
                 analysis.set_retention(new_retention)
+                analysis.set_directory(new_analysis_directory)
                 
             #Process for the project's run's analyzes
             run_analyzes_ids = project.get_project_runs_analyzes_ids()
@@ -151,7 +147,6 @@ class SwitchProjectSpaceId (BasicNG6Workflow):
                 #Update the directory in DB
                 new_analysis_directory = analysis.get_directory()
                 new_analysis_directory = new_analysis_directory.replace(old_directory, new_directory)
-                analysis.set_directory(new_analysis_directory)
                 
                 #Moving the files
                 #if not os.path.isdir(path_new_analysis_directory) :
@@ -171,4 +166,8 @@ class SwitchProjectSpaceId (BasicNG6Workflow):
                 #Update the retention in DB
                 old_retention = analysis.get_creation_date()
                 new_retention = ng6conf.compute_new_retention_date(self.space_id,old_retention)
-                analysis.set_retention(new_retention)
\ No newline at end of file
+                analysis.set_retention(new_retention)
+                analysis.set_directory(new_analysis_directory)
+            
+            #Update to the projcet's space_id
+            project.update_space_id(self.space_id)
\ No newline at end of file