You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by nc...@apache.org on 2023/07/07 18:09:26 UTC
[incubator-sdap-nexus] branch master updated: SDAP-474 - Fixed bug in CSV attributes (#264)
This is an automated email from the ASF dual-hosted git repository.
nchung 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 610b6ea SDAP-474 - Fixed bug in CSV attributes (#264)
610b6ea is described below
commit 610b6ea5a53bbff85a21fb0017117017808f15b0
Author: Riley Kuttruff <72...@users.noreply.github.com>
AuthorDate: Fri Jul 7 11:09:21 2023 -0700
SDAP-474 - Fixed bug in CSV attributes (#264)
* Check if matchup param is a list or str
* Changelog
---------
Co-authored-by: rileykk <ri...@jpl.nasa.gov>
---
CHANGELOG.md | 1 +
analysis/webservice/algorithms/doms/BaseDomsHandler.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 719ec99..53c1295 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed
- SDAP-465: Removed `climatology` directory.
### Fixed
+- SDAP-474: Fixed bug in CSV attributes where secondary dataset would be rendered as comma separated characters
### Security
## [1.1.0] - 2023-04-26
diff --git a/analysis/webservice/algorithms/doms/BaseDomsHandler.py b/analysis/webservice/algorithms/doms/BaseDomsHandler.py
index 2897e8d..af2e6d3 100644
--- a/analysis/webservice/algorithms/doms/BaseDomsHandler.py
+++ b/analysis/webservice/algorithms/doms/BaseDomsHandler.py
@@ -267,7 +267,7 @@ class DomsCSVFormatter:
{"Global Attribute": "CDMS_DatasetMetadata", "Value": ', '.join(insituLinks)},
{"Global Attribute": "CDMS_primary", "Value": params["primary"]},
- {"Global Attribute": "CDMS_secondary", "Value": ','.join(params['matchup'])},
+ {"Global Attribute": "CDMS_secondary", "Value": ','.join(params['matchup']) if isinstance(params["matchup"], list) else params['matchup']},
{"Global Attribute": "CDMS_ParameterPrimary", "Value": params.get("parameter", "")},
{"Global Attribute": "CDMS_time_to_complete", "Value": details["timeToComplete"]},