diff --git a/moondb.py b/moondb.py index de3cc4e60031f56e7ac2964fa848ddd04c53fe8a..038bd6ae8439a785d5719fd0d737af0da1209587 100755 --- a/moondb.py +++ b/moondb.py @@ -43,10 +43,11 @@ def get_missions(): missions = [] resp = requests.get(_url('/authorities/missions/')) _check_resp(resp) + print resp.json()['result'] for m_item in resp.json()['result']: missions.append( Mission(m_item['name'] )) print(m_item) - this_m = json.loads( "{'name': 'Apollo 11'}" ) + #this_m = json.load( "{'name': 'Apollo 11'}" ) return missions def get_missions2(): @@ -65,6 +66,18 @@ def get_samplingtechnique(): class Filter: def __init__(self): self.mission = None + self.landmark = None + self.specimenType = None + self.samplingTechnique = None + self.analyzedMaterial = None + self.analyte = None + self.analysisMethod = None + def _toJSON(self): + return json.dumps(self, default=lambda o: o.__dict__,sort_keys=True, indent=4) + def get_results(self): + print self._toJSON() + resp = requests.get(_url('/data/'+self._toJSON() )) + class Mission: @@ -85,3 +98,11 @@ class Analyte: if __name__ == "__main__": m = get_missions() print m + f = Filter() + f.mission = ["Apollo 11"] + f.specimenType = ["Breccia"] + #print f.toJSON() + print f.get_results() + + +