diff options
| author | Sashi20 | 2017-10-03 15:42:22 +0530 |
|---|---|---|
| committer | GitHub | 2017-10-03 15:42:22 +0530 |
| commit | 0dd2320fdc12ddfde900e45ac937d7675e271ddc (patch) | |
| tree | ae0c66160efb55155f5f91abfee4cf2740df708b /full_download.inc | |
| parent | 1f565cbcd128f31280da4f07dceda0e69cace8f9 (diff) | |
| parent | 4fad355a3f1ae72875208c59ac377c06f03455ae (diff) | |
| download | dwsim_flowsheet-0dd2320fdc12ddfde900e45ac937d7675e271ddc.tar.gz dwsim_flowsheet-0dd2320fdc12ddfde900e45ac937d7675e271ddc.tar.bz2 dwsim_flowsheet-0dd2320fdc12ddfde900e45ac937d7675e271ddc.zip | |
Merge pull request #17 from Sashi20/drupal_7.x
Fixed issue of Full Download
Diffstat (limited to 'full_download.inc')
| -rwxr-xr-x | full_download.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/full_download.inc b/full_download.inc index 1fd9b58..15be090 100755 --- a/full_download.inc +++ b/full_download.inc @@ -23,7 +23,7 @@ function dwsim_flowsheet_download_full_project() while ($flowsheet_udc_row = $flowsheet_udc_q->fetchObject()) { if ($flowsheet_udc_row->user_defined_compound_filepath || $flowsheet_udc_row->user_defined_compound_filepath != 'NULL') { $USER_DEFINED_PATH = 'user_defined_compound/'; - $zip->addFile($root_path . $FLOWSHEET_PATH . '/' . $flowsheet_udc_row->user_defined_compound_filepath, $USER_DEFINED_PATH . str_replace(' ', '_', basename($flowsheet_udc_row->user_defined_compound_filepath))); + $zip->addFile($root_path . $FLOWSHEET_PATH . '/' . $flowsheet_udc_row->user_defined_compound_filepath, $FLOWSHEET_PATH . $USER_DEFINED_PATH . str_replace(' ', '_', basename($flowsheet_udc_row->user_defined_compound_filepath))); } //$flowsheet_udc_row->user_defined_compound_filepath || $flowsheet_udc_row->user_defined_compound_filepath != 'NULL' } //$flowsheet_udc_row = $flowsheet_udc_q->fetchObject() $query = db_select('dwsim_flowsheet_submitted_abstracts_file'); @@ -31,7 +31,8 @@ function dwsim_flowsheet_download_full_project() $query->condition('proposal_id', $flowsheet_id); $flowsheet_f_q = $query->execute(); while ($flowsheet_f_row = $flowsheet_f_q->fetchObject()) { - $zip->addFile($root_path . $FLOWSHEET_PATH . '/' . $flowsheet_f_row->filepath, str_replace(' ', '_', basename($flowsheet_f_row->filename))); + + $zip->addFile($root_path . $FLOWSHEET_PATH . '/' . $flowsheet_f_row->filepath, $FLOWSHEET_PATH . str_replace(' ', '_', basename($flowsheet_f_row->filename))); } //$flowsheet_f_row = $flowsheet_f_q->fetchObject() $zip_file_count = $zip->numFiles; $zip->close(); |