LIMS-1498: Change name of processed data archive (#855)

Co-authored-by: Mark Williams <[email protected]>
DiamondLightSource · Nov 12, 2024 · 6ba748f · 6ba748f
1 parent c5f958c
commit 6ba748f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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);
     }