Skip to content

Sfresults #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sreeder merged 6 commits into from
Nov 15, 2017
Merged

Sfresults #123

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00834dd
add sfids, sfcodes and sfuuids to getResults
Nov 13, 2017
69656fa
test sfresult function
Nov 13, 2017
1559213
add todo comment
Nov 13, 2017
5ec7eb6
update warning message
Nov 13, 2017
be1a758
add restype to result function
Nov 14, 2017
817a78e
Merge branch 'development' into sfresults
sreeder Nov 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add restype to result function
  • Loading branch information
sreeder committed Nov 14, 2017
commit be1a758dbc3cb2115874e41005f4f00f2d51f630
11 changes: 8 additions & 3 deletions odm2api/ODM2/services/readService.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ def getAffiliations(self, ids=None, personfirst=None, personlast=None, orgcode=N
return None

# Results
def getResults(self, ids=None, type=None, uuids=None, actionid=None, simulationid=None, sfid=None,
def getResults(self, ids=None, type=None, restype = None, uuids=None, actionid=None, simulationid=None, sfid=None,
variableid=None, siteid=None, sfids=None, sfuuids=None, sfcodes=None):

# TODO what if user sends in both type and actionid vs just actionid
Expand All @@ -625,7 +625,7 @@ def getResults(self, ids=None, type=None, uuids=None, actionid=None, simulationi

Args:
ids (list, optional): List of ResultIDs.
type (str, optional): Type of Result from
restype (str, optional): Type of Result from
`controlled vocabulary name <http://vocabulary.odm2.org/resulttype/>`_.
uuids (list, optional): List of UUIDs string.
actionid (int, optional): ActionID.
Expand All @@ -642,7 +642,7 @@ def getResults(self, ids=None, type=None, uuids=None, actionid=None, simulationi

Examples:
>>> ReadODM2.getResults(ids=[39,40])
>>> ReadODM2.getResults(type='Time series coverage')
>>> ReadODM2.getResults(restype='Time series coverage')
>>> ReadODM2.getResults(sfids=[65])
>>> ReadODM2.getResults(uuids=['a6f114f1-5416-4606-ae10-23be32dbc202',
... '5396fdf3-ceb3-46b6-aaf9-454a37278bb4'])
Expand All @@ -655,7 +655,12 @@ def getResults(self, ids=None, type=None, uuids=None, actionid=None, simulationi
query = self._session.query(Results)

if type:
import warnings
warnings.warn(
"The parameter 'type' is no longer be supported. Please use the restype parameter instead.")
query = query.filter_by(ResultTypeCV=type)
if restype:
query = query.filter_by(ResultTypeCV=restype)
if variableid:
query = query.filter_by(VariableID=variableid)
if ids:
Expand Down