diff --git a/README.md b/README.md index 4594f73436a37851ce47ee222dd63655d5c21bdd..ad9ba0895937eece53766498a80b40d28c40e467 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,8 @@ To use moondb module, simply do:: >>> import moondb >>> s_12023 = moondb.get_specimens(sc=['12023'])[0] + >>> print( type(s_12023) ) + >>> ", ".join( (s_12023.mission,s_12023.landmark,s_12023.specimenType) ) # How to cite MoonDB and python-moondb diff --git a/moondb.egg-info/SOURCES.txt b/moondb.egg-info/SOURCES.txt index 4242a29f3bcf5f73a0285bd9cb6a683a14d93d43..c9a8f6b8b802cd0947f142608aa6dc1f3939f111 100644 --- a/moondb.egg-info/SOURCES.txt +++ b/moondb.egg-info/SOURCES.txt @@ -1,9 +1,10 @@ MANIFEST.in README.md setup.py -examples/Apollo11_soils.py +examples/Apollo12_soils.py examples/example1.ipynb examples/specimen.py +examples/specimens_weight.py moondb/__init__.py moondb/core.py moondb/helpers.py diff --git a/moondb/__pycache__/core.cpython-37.pyc b/moondb/__pycache__/core.cpython-37.pyc index 0816258664bb2a023d963806c0222da6c1df54df..3e84a83b96fb9e96ab990777c04a0cb101df45da 100644 Binary files a/moondb/__pycache__/core.cpython-37.pyc and b/moondb/__pycache__/core.cpython-37.pyc differ diff --git a/moondb/core.py b/moondb/core.py index a062a1ceb1592f3b8c46bbf89ec201fed028f065..8083d633199e598b4911a488202d3fd74f2e06c8 100644 --- a/moondb/core.py +++ b/moondb/core.py @@ -173,8 +173,8 @@ def get_specimens(sc=None,mn=None,ln=None,sty=None,ste=None): sp_list = [] if sc: for s in sc: - count,spec = _get_resp('/specimen/'+s) - sp_list.extend(spec) + spec = _get_resp('/specimen/'+s) + sp_list.append(spec) if mn: for n in mn: count,spec = _get_resp('/specimenlist/mission/'+n) @@ -289,7 +289,6 @@ class SpecimenFilter: samplingTechnique: list = None def get_results(self): - #res_list = get_specimens(mn=["Apollo 11"]) res_list = get_specimens(sc=self.specimenCode, mn=self.missionName, ln=self.landmarkName,