From 6fcd837e350267409bbd2904d6b24f60c96809e8 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Wed, 22 Jan 2025 18:32:19 +0100
Subject: [PATCH] mcutout: disables Href in result-xml output (redirect is not
needed)
---
.../java/mcutout/webapi/UWSMCutoutWork.java | 20 ++-----------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutWork.java b/data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutWork.java
index dddf411..2d4ca48 100644
--- a/data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutWork.java
+++ b/data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutWork.java
@@ -118,29 +118,13 @@ public class UWSMCutoutWork extends JobThread
else if(contentType.equals("application/gzip") || contentType.equals("application/x-tar+gzip"))
{
logger.logThread(LogLevel.INFO, this,
- "Prepare Result", "content type:" + contentType, null);
+ "Prepare Result", "content type:" + contentType + " job:requestUrl: " + job.getUrl().getRequestURL(), null);
final String id = "mcutout.tar.gz";
- //Result result = createResult(id);
- final String myResultUrl = job.getUrl().getRequestURL() + "/results/" + id;
- logger.logThread(LogLevel.INFO, this,
- "Result", "myResultUrl: " + myResultUrl, null);
- Result result = new Result(id, "simple", myResultUrl, false);
- //Result result = new Result(id, "simple", job.getUrl().getRequestURL() + "/" + UWSJob.PARAM_RESULTS + "/" + id, false);
+ Result result = new Result(id, "none", null, false);
result.setMimeType("application/gzip");
OutputStream respOutputStream = getResultOutput(result);
- final String requestUrl = job.getUrl().getRequestURL();
- final String defaultUrl = result.getDefaultUrl(id, job);
- final String resultFileUrl = result.getHref();
-
- logger.logThread(LogLevel.INFO, this,
- "Result", "job->requestUrl(): " + requestUrl, null);
- logger.logThread(LogLevel.INFO, this,
- "Result", "result.getDefaultUrl(): " + defaultUrl, null);
- logger.logThread(LogLevel.INFO, this,
- "Result", "result.getHref(): " + resultFileUrl, null);
-
String absCutPathname = mresult.fileName;
File downloadFile = new File(absCutPathname);
FileInputStream fileInput = new FileInputStream(downloadFile);
--
GitLab