diff options
Diffstat (limited to 'general_deletion.inc')
| -rwxr-xr-x | general_deletion.inc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/general_deletion.inc b/general_deletion.inc index 33ac98a..1121ef5 100755 --- a/general_deletion.inc +++ b/general_deletion.inc @@ -116,8 +116,10 @@ function lab_migration_delete_solution($solution_id) $query->condition('id', $experiment_data->proposal_id); $proposal_q = $query->execute(); $proposal_data = $proposal_q->fetchObject(); - $ex_path = $proposal_data->directory_name . '/' . $solution_files_data->filepath; - $dir_path = $root_path . $ex_path; + //$ex_path = $proposal_data->directory_name . '/' . $solution_files_data->filepath; + //$dir_path = $root_path . $ex_path; + $dir_path = $root_path . $proposal_data->directory_name . '/EXP' . $experiment_data->number . '/CODE' . $solution_data->code_number; + //var_dump($dir_path);die; if (is_dir($dir_path)) { if (!rmdir($dir_path)) @@ -167,6 +169,12 @@ function lab_migration_delete_experiment($experiment_id) $query->condition('id', $experiment_id); $experiment_q = $query->execute(); $experiment_data = $experiment_q->fetchObject(); + $query = db_select('lab_migration_proposal'); + $query->fields('lab_migration_proposal'); + $query->condition('id', $form_state['values']['lab']); + $proposal_q = $query->execute(); + $proposal_data = $proposal_q->fetchObject(); + if (!$experiment_data) { drupal_set_message('Invalid experiment.', 'error'); @@ -195,7 +203,7 @@ function lab_migration_delete_experiment($experiment_id) if ($status) { - $dir_path = $root_path . $experiment_data->proposal_id . '/EXP' . $experiment_data->number; + $dir_path = $root_path . $proposal_data->directory_name . '/EXP' . $experiment_data->number; if (is_dir($dir_path)) { |