diff --git a/data-access/servlet/src/main/java/cutout/DatasetsCli.java b/data-access/servlet/src/main/java/cutout/DatasetsCli.java index f6a125b855f018d0c04a7a3c81747e23198aae8f..c6d4ee6ef2aa94936f1d2ca5696e30496ac571d9 100644 --- a/data-access/servlet/src/main/java/cutout/DatasetsCli.java +++ b/data-access/servlet/src/main/java/cutout/DatasetsCli.java @@ -30,6 +30,8 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream; import java.io.BufferedOutputStream; +import java.util.Date; +import java.text.SimpleDateFormat; import vo.parameter.*; @@ -122,7 +124,9 @@ class DatasetsCli implements Datasets private MCutResult doCompressCutFiles(MCutResult.Cut[] cutArr) throws IOException, InterruptedException { - final String tgzFileName = settings.fitsPaths.cutouts() + "/mcutout_TIMESTAMP.tar.gz"; + String timestamp = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + + final String tgzFileName = settings.fitsPaths.cutouts() + "/mcutout_" + timestamp + ".tar.gz"; /* StringBuilder sb = new StringBuilder(); for(MCutResult.Cut cut : cutArr) @@ -173,9 +177,9 @@ class DatasetsCli implements Datasets MCutResult mCutResult = new MCutResult(); mCutResult.cutResArr = cutArr; mCutResult.fileName = tgzFileName; - mCutResult.fileSize = 0; + mCutResult.fileSize = Files.size(output); - // FIXME add response.json to tar.gz, add timestamp, add filesize when successful + // FIXME add response.json to tar.gz, add nanosecs to timestamp return mCutResult; }