From 6ba748fcc5f973fc0e8be71c3b25b91e74a819a8 Mon Sep 17 00:00:00 2001 From: Mark W <24956497+ndg63276@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:05:01 +0000 Subject: [PATCH] LIMS-1498: Change name of processed data archive (#855) Co-authored-by: Mark Williams --- api/src/Page/Download.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/Page/Download.php b/api/src/Page/Download.php index a1ed29bca..4a6c925f3 100644 --- a/api/src/Page/Download.php +++ b/api/src/Page/Download.php @@ -468,14 +468,14 @@ function _get_autoproc_archive() $aps = $this->db->union( array( - "SELECT app.autoprocprogramid, app.processingprograms, app.processingstatus + "SELECT app.autoprocprogramid, app.processingprograms, app.processingstatus, dc.imageprefix, dc.datacollectionnumber FROM autoprocintegration api INNER JOIN autoprocprogram app ON api.autoprocprogramid = app.autoprocprogramid INNER JOIN datacollection dc ON dc.datacollectionid = api.datacollectionid INNER JOIN datacollectiongroup dcg ON dcg.datacollectiongroupid = dc.datacollectiongroupid INNER JOIN blsession s ON s.sessionid = dcg.sessionid WHERE s.proposalid=:1 AND app.autoprocprogramid=:2", - "SELECT app.autoprocprogramid, app.processingprograms, app.processingstatus + "SELECT app.autoprocprogramid, app.processingprograms, app.processingstatus, dc.imageprefix, dc.datacollectionnumber FROM autoprocprogram app INNER JOIN processingjob pj on pj.processingjobid = app.processingjobid INNER JOIN datacollection dc ON dc.datacollectionid = pj.datacollectionid @@ -497,7 +497,7 @@ function _get_autoproc_archive() } $clean_program = preg_replace('/[^A-Za-z0-9\-]/', '', $ap['PROCESSINGPROGRAMS']); - $zipName = $this->arg('AUTOPROCPROGRAMID') . '_' . $clean_program; + $zipName = $this->arg('AUTOPROCPROGRAMID') . '_' . $ap['IMAGEPREFIX'] . '_' . $ap['DATACOLLECTIONNUMBER'] . '_' . $clean_program; $this->_streamZipFile($files, $zipName); }