This is an automated email from the ASF dual-hosted git repository.
skperez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
The following commit(s) were added to refs/heads/master by this push:
new 2b056aa SDAP-449: Fix for NetCDF handling in SUI (#236)
2b056aa is described below
commit 2b056aa68fc74074d4760266b586c4c4840641dc
Author: Riley Kuttruff <[email protected]>
AuthorDate: Fri Mar 17 11:48:26 2023 -0700
SDAP-449: Fix for NetCDF handling in SUI (#236)
Co-authored-by: rileykk <[email protected]>
---
CHANGELOG.md | 2 ++
analysis/webservice/apidocs/dataset-populate.js | 2 +-
analysis/webservice/apidocs/openapi.yml | 4 ++--
.../webservice/nexus_tornado/request/renderers/NexusNETCDFRenderer.py | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fc40e1..0aa4b91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,8 @@ and this project adheres to [Semantic
Versioning](https://semver.org/spec/v2.0.0
- Made `platforms` param optional in `/cdmssubset`, and removed int requirement
- Updated OpenAPI specification for `/cdmssubset` to accurately reflect
`platforms` and `parameter` field options.
- SDAP-436: Added special case for handling Cassandra SwathMulti tiles with
uniform time arrays
+- SDAP-449: Fixed `/cdmsresults` NetCDF output displaying and downloading as
.txt.
+- SDAP-449: Fixed 404 error when populating datasets; script was still using
`/domslist`
### Security
## [1.0.0] - 2022-12-05
diff --git a/analysis/webservice/apidocs/dataset-populate.js
b/analysis/webservice/apidocs/dataset-populate.js
index 6e447eb..89c3f82 100644
--- a/analysis/webservice/apidocs/dataset-populate.js
+++ b/analysis/webservice/apidocs/dataset-populate.js
@@ -15,7 +15,7 @@
function DatasetPopulatePlugin(system) {
- const DS_PATH = '/domslist'
+ const DS_PATH = '/cdmslist'
const ACTION_UPDATE_DATASETS = 'UPDATE_DATASETS'
const ACTION_UPDATE_ERROR = 'UPDATE_ERROR'
diff --git a/analysis/webservice/apidocs/openapi.yml
b/analysis/webservice/apidocs/openapi.yml
index 36982af..55802cd 100644
--- a/analysis/webservice/apidocs/openapi.yml
+++ b/analysis/webservice/apidocs/openapi.yml
@@ -500,7 +500,7 @@ paths:
get:
summary: |
Convert matchup result
- operationId: domsresults
+ operationId: cdmsresults
tags:
- Matchup
parameters:
@@ -529,7 +529,7 @@ paths:
text/csv:
schema:
type: string
- application/octet-stream:
+ application/x-netcdf:
schema:
type: string
format: binary
diff --git
a/analysis/webservice/nexus_tornado/request/renderers/NexusNETCDFRenderer.py
b/analysis/webservice/nexus_tornado/request/renderers/NexusNETCDFRenderer.py
index 00970de..9049d26 100644
--- a/analysis/webservice/nexus_tornado/request/renderers/NexusNETCDFRenderer.py
+++ b/analysis/webservice/nexus_tornado/request/renderers/NexusNETCDFRenderer.py
@@ -24,7 +24,7 @@ class NexusNETCDFRenderer(object):
def render(self, tornado_handler, result):
tornado_handler.set_header("Content-Type", "application/x-netcdf")
- tornado_handler.set_header("Content-Disposition", "filename=\"%s\"" %
self._request.get_argument('filename', "download.nc"))
+ tornado_handler.set_header("Content-Disposition", "attachment;
filename=\"%s\"" % self._request.get_argument('filename', "download.nc"))
try:
tornado_handler.write(result.toNetCDF())
except:
