summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSashi202019-09-24 15:27:20 +0530
committerGitHub2019-09-24 15:27:20 +0530
commitfba6b75ecdfb2e7b4c93c7b1b35fe02cccf69f79 (patch)
tree9d6b49156685b059d62a941ace4e6abbb6c2ecae
parentd01af54137565222fa72cc7890e23da1e407a5d7 (diff)
parent064535489be44c6955b09785615fa257d0f39ea7 (diff)
downloadDWSIM_lab_migration-fba6b75ecdfb2e7b4c93c7b1b35fe02cccf69f79.tar.gz
DWSIM_lab_migration-fba6b75ecdfb2e7b4c93c7b1b35fe02cccf69f79.tar.bz2
DWSIM_lab_migration-fba6b75ecdfb2e7b4c93c7b1b35fe02cccf69f79.zip
Merge pull request #7 from Sashi20/master
Modify column names to fix errors
-rwxr-xr-xfull_download.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/full_download.inc b/full_download.inc
index 8d7fe3f..e7aca68 100755
--- a/full_download.inc
+++ b/full_download.inc
@@ -27,7 +27,7 @@ function lab_migration_download_full_experiment()
while ($solution_row = $solution_q->fetchObject())
{
$CODE_PATH = 'CODE' . $solution_row->code_number . '/';
- $solution_files_q = db_query("SELECT lmsf.*, lmp.directory_name FROM lab_migration_solution_files lmsf JOIN lab_migration_solution lms JOIN lab_migration_experiment lme JOIN lab_migration_proposal lmp WHERE lms.id = lmsf.solution_id AND lme.id = lms.experiment_id AND lmp.id = lme.proposal_id AND lmsf.soultion_id = :solution_id", array(':solution_id' => $solution_row->id));
+ $solution_files_q = db_query("SELECT lmsf.*, lmp.directory_name FROM lab_migration_solution_files lmsf JOIN lab_migration_solution lms JOIN lab_migration_experiment lme JOIN lab_migration_proposal lmp WHERE lms.id = lmsf.solution_id AND lme.id = lms.experiment_id AND lmp.id = lme.proposal_id AND lmsf.solution_id = :solution_id", array(':solution_id' => $solution_row->id));
while ($solution_files_row = $solution_files_q->fetchObject())
{
$zip->addFile($root_path . $solution_files_row->directory_name. '/' . $solution_files_row->filepath, $APPROVE_PATH . $EXP_PATH . $CODE_PATH . $solution_files_row->filename);
@@ -42,7 +42,7 @@ function lab_migration_download_full_experiment()
while ($solution_row = $solution_q->fetchObject())
{
$CODE_PATH = 'CODE' . $solution_row->code_number . '/';
- $solution_files_q = db_query("SELECT lmsf.*, lmp.directory_name FROM lab_migration_solution_files lmsf JOIN lab_migration_solution lms JOIN lab_migration_experiment lme JOIN lab_migration_proposal lmp WHERE lms.id = lmsf.solution_id AND lme.id = lms.experiment_id AND lmp.id = lme.proposal_id AND lmsf.soultion_id = :solution_id", array(':solution_id' => $solution_row->id));
+ $solution_files_q = db_query("SELECT lmsf.*, lmp.directory_name FROM lab_migration_solution_files lmsf JOIN lab_migration_solution lms JOIN lab_migration_experiment lme JOIN lab_migration_proposal lmp WHERE lms.id = lmsf.solution_id AND lme.id = lms.experiment_id AND lmp.id = lme.proposal_id AND lmsf.solution_id = :solution_id", array(':solution_id' => $solution_row->id));
while ($solution_files_row = $solution_files_q->fetchObject())
{
$zip->addFile($root_path . $solution_files_row->directory_name . '/' . $solution_files_row->filepath, $PENDING_PATH . $EXP_PATH . $CODE_PATH . $solution_files_row->filename);