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 2024/02/01 20:58:38 UTC

(incubator-sdap-nexus) branch develop updated: SDAP-499: Add page number to default filename for matchup output (#288)

This is an automated email from the ASF dual-hosted git repository.

nchung pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git


The following commit(s) were added to refs/heads/develop by this push:
     new b0d64c0  SDAP-499: Add page number to default filename for matchup output (#288)
b0d64c0 is described below

commit b0d64c0180429eadea3b2f50e853c0202e4273b8
Author: Stepheny Perez <sk...@users.noreply.github.com>
AuthorDate: Thu Feb 1 12:58:33 2024 -0800

    SDAP-499: Add page number to default filename for matchup output (#288)
    
    * removed resultSizeLimit param from matchup
    
    * Add # of primaries/avergae secondaries to job output
    
    * rename to executionId
    
    * update changelog
    
    * add totalSecondaryMatched field to /job output
    
    * num unique secondaries addition
    
    * updated docs to use correct sea_water_temperature param name
    
    * bugfix
    
    * fix division by zero bug
    
    * add page number to default filename for matchup output
    
    * pagination improvements
    
    * removed debugging line
    
    * changelog
    
    * Update helm cassandra dependency (#289)
    
    * Update helm cassandra dependency
    
    * Bump default cassandra PV to 4
    
    * Bump default cassandra PV to 4 in tools
    
    * Changelog
    
    * Fixed small documentation issue
    
    ---------
    
    Co-authored-by: rileykk <ri...@jpl.nasa.gov>
    
    * Revert "Update helm cassandra dependency (#289)"
    
    This reverts commit 1e8cc4e9d31d295e172c0db4bba61a5776642bea.
    
    * changelog
    
    ---------
    
    Co-authored-by: Riley Kuttruff <72...@users.noreply.github.com>
    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 e2cd3a0..da2b3c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Updated /job endpoint to use `executionId` terminology for consistency with existing `/cdmsresults` endpoint
   - Updated /job endpoint with details about number of primary and secondary tiles.
 - SDAP-500: Improvements to SDAP Asynchronous Jobs
+- SDAP-499: Added page number to default filename for matchup output
 ### Deprecated
 ### Removed
 - SDAP-493: 
diff --git a/analysis/webservice/algorithms/doms/BaseDomsHandler.py b/analysis/webservice/algorithms/doms/BaseDomsHandler.py
index faa384f..f1ac092 100644
--- a/analysis/webservice/algorithms/doms/BaseDomsHandler.py
+++ b/analysis/webservice/algorithms/doms/BaseDomsHandler.py
@@ -107,7 +107,7 @@ class DomsQueryResults(NexusResults):
         return DomsNetCDFFormatter.create(self.__executionId, self.results(), self.__args, self.__details)
 
     def filename(self):
-        return f'CDMS_{self.__executionId}'
+        return f'CDMS_{self.__executionId}_page{self.__details["pageNum"]}'
 
 
 class DomsCSVFormatter: