You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by rk...@apache.org on 2023/07/05 20:41:59 UTC
[incubator-sdap-nexus] branch SDAP-467-b created (now 00a1dba)
This is an automated email from the ASF dual-hosted git repository.
rkk pushed a change to branch SDAP-467-b
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
at 00a1dba Fix for custom results type for cdmslist query
This branch includes the following new commits:
new 82810e1 Fix for cdmslist bug
new 00a1dba Fix for custom results type for cdmslist query
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-sdap-nexus] 01/02: Fix for cdmslist bug
Posted by rk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rkk pushed a commit to branch SDAP-467-b
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 82810e1f95ef050988c7723e2f08bf71879f3c1b
Author: rileykk <ri...@jpl.nasa.gov>
AuthorDate: Wed Jul 5 13:28:12 2023 -0700
Fix for cdmslist bug
---
analysis/webservice/algorithms/doms/DatasetListQuery.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/analysis/webservice/algorithms/doms/DatasetListQuery.py b/analysis/webservice/algorithms/doms/DatasetListQuery.py
index 78ba6ab..bf3c07f 100644
--- a/analysis/webservice/algorithms/doms/DatasetListQuery.py
+++ b/analysis/webservice/algorithms/doms/DatasetListQuery.py
@@ -23,7 +23,7 @@ from . import config
from . import values
from webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler
from webservice.NexusHandler import nexus_handler
-from webservice.webmodel import cached
+from webservice.webmodel import cached, NexusResults
@nexus_handler
@@ -120,4 +120,4 @@ class DomsDatasetListQueryHandler(BaseDomsHandler.BaseDomsQueryCalcHandler):
"insitu": insituList
}
- return BaseDomsHandler.DomsQueryResults(results=values)
+ return NexusResults(results=values)
[incubator-sdap-nexus] 02/02: Fix for custom results type for cdmslist query
Posted by rk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rkk pushed a commit to branch SDAP-467-b
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 00a1dbac5c45618fa9f2b675c42fc45b1d83340a
Author: rileykk <ri...@jpl.nasa.gov>
AuthorDate: Wed Jul 5 13:34:54 2023 -0700
Fix for custom results type for cdmslist query
---
analysis/webservice/algorithms/doms/DatasetListQuery.py | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/analysis/webservice/algorithms/doms/DatasetListQuery.py b/analysis/webservice/algorithms/doms/DatasetListQuery.py
index bf3c07f..7c40d18 100644
--- a/analysis/webservice/algorithms/doms/DatasetListQuery.py
+++ b/analysis/webservice/algorithms/doms/DatasetListQuery.py
@@ -120,4 +120,14 @@ class DomsDatasetListQueryHandler(BaseDomsHandler.BaseDomsQueryCalcHandler):
"insitu": insituList
}
- return NexusResults(results=values)
+ return DatasetListResults(results=values)
+
+
+class DatasetListResults(NexusResults):
+ def __init__(self, results=None):
+ NexusResults.__init__(self, results=results)
+
+ self.__results = results
+
+ def toJson(self):
+ return json.dumps({'data': self.__results}, indent=4)