Merge pull request #7258 from IQSS/7255-folders-support-in-zipper

Fix for the folders in zipper
IQSS · Sep 10, 2020 · c7d63c1 · c7d63c1
2 parents 3cf3b0e + 06905ec
commit c7d63c1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java
@@ -20,6 +20,7 @@
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.FileUtil;
+import edu.harvard.iq.dataverse.util.StringUtil;
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -563,6 +564,10 @@ public void addFileToCustomZipJob(String key, DataFile dataFile, Timestamp times
                 fileName = dataFile.getFileMetadata().getLabel();
             }
         }
+
+        if (StringUtil.nonEmpty(dataFile.getFileMetadata().getDirectoryLabel())) {
+            fileName = dataFile.getFileMetadata().getDirectoryLabel() + "/" + fileName;
+        }
 
         if (location != null && fileName != null) {
             em.createNativeQuery("INSERT INTO CUSTOMZIPSERVICEREQUEST (KEY, STORAGELOCATION, FILENAME, ISSUETIME) VALUES ("