From eac0c8b7297db7c35929d1870f14115ddfc94543 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Wed, 15 May 2024 20:09:48 +0200
Subject: [PATCH] mcutout zip files without dirs
---
.../servlet/src/main/java/cutout/DatasetsCli.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/data-access/servlet/src/main/java/cutout/DatasetsCli.java b/data-access/servlet/src/main/java/cutout/DatasetsCli.java
index 3de95c1..395002b 100644
--- a/data-access/servlet/src/main/java/cutout/DatasetsCli.java
+++ b/data-access/servlet/src/main/java/cutout/DatasetsCli.java
@@ -122,17 +122,20 @@ class DatasetsCli implements Datasets
LOGGER.info("cut-id"+ String.valueOf(cut.index) + " -> " + cut.content);
if(cut.contentType == MCutResult.Cut.ContentType.FILENAME)
{
- sb.append(" " + cut.content);
+ Path p = Paths.get(cut.content);
+ sb.append(" " + p.getFileName().toString());
}
}
final String tgzFileName = settings.fitsPaths.cutouts() + "/mcutout_TIMESTAMP.tar.gz";
- String[] cmd = new String[4];
+ String[] cmd = new String[6];
cmd[0] = "/bin/tar";
cmd[1] = "cfz";
cmd[2] = tgzFileName;
- cmd[3] = sb.toString();
+ cmd[3] = "-C";
+ cmd[4] = settings.fitsPaths.cutouts();
+ cmd[5] = sb.toString();
LOGGER.info("CMD: " + String.join(" ",cmd));
--
GitLab