Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vlkb-soda
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ViaLactea
vlkb-soda
Commits
6fcd837e
Commit
6fcd837e
authored
4 months ago
by
Robert Butora
Browse files
Options
Downloads
Patches
Plain Diff
mcutout: disables Href in result-xml output (redirect is not needed)
parent
47af6d31
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutWork.java
+2
-18
2 additions, 18 deletions
.../servlet/src/main/java/mcutout/webapi/UWSMCutoutWork.java
with
2 additions
and
18 deletions
data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutWork.java
+
2
−
18
View file @
6fcd837e
...
@@ -118,29 +118,13 @@ public class UWSMCutoutWork extends JobThread
...
@@ -118,29 +118,13 @@ public class UWSMCutoutWork extends JobThread
else
if
(
contentType
.
equals
(
"application/gzip"
)
||
contentType
.
equals
(
"application/x-tar+gzip"
))
else
if
(
contentType
.
equals
(
"application/gzip"
)
||
contentType
.
equals
(
"application/x-tar+gzip"
))
{
{
logger
.
logThread
(
LogLevel
.
INFO
,
this
,
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"
;
final
String
id
=
"mcutout.tar.gz"
;
//Result result = createResult(id);
Result
result
=
new
Result
(
id
,
"none"
,
null
,
false
);
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
.
setMimeType
(
"application/gzip"
);
result
.
setMimeType
(
"application/gzip"
);
OutputStream
respOutputStream
=
getResultOutput
(
result
);
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
;
String
absCutPathname
=
mresult
.
fileName
;
File
downloadFile
=
new
File
(
absCutPathname
);
File
downloadFile
=
new
File
(
absCutPathname
);
FileInputStream
fileInput
=
new
FileInputStream
(
downloadFile
);
FileInputStream
fileInput
=
new
FileInputStream
(
downloadFile
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment