From d9d94028312d55c05388b4ab99d93a18a8a2ec13 Mon Sep 17 00:00:00 2001 From: Alessandro Frigeri <alessandro.frigeri@inaf.it> Date: Tue, 14 May 2019 10:02:03 +0200 Subject: [PATCH] first example in README --- README.md | 2 ++ moondb.egg-info/SOURCES.txt | 3 ++- moondb/__pycache__/core.cpython-37.pyc | Bin 12111 -> 12117 bytes moondb/core.py | 5 ++--- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4594f73..ad9ba08 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 4242a29..c9a8f6b 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 GIT binary patch delta 1981 zcmX>fcQuaJiI<m)fq{X+p!ily)JEQHcE($qE7|3k7?mbFut+c}PTt5V%&0gyf!}2_ zCzmlJqtawsZg+?zt1<%vgTv%*-jL1TxD7y3>b!1HDHR3=29L=B{2`m~^NNC`zVg{Z zqy$wN7#IQ=7#ND#7#J8h7&(|G2MEee;?SPFgg=l`eX=i?%w!>f^NdQ99|^cXw1}!P zFfc?QX<_DIDpH%Az%MyDSMV6C1_J{_(&Ya_Hj_()v>9(rULX`DsL8;<kOtDh1h%9| zb27K^EJj_Bp9J+77#K2<<n$(=7Y^jO#afV9RGfNivWAF0ix~q0!{iTYVv`F+q8TkG zpB0g0+&1~S$V7n>)*7Z}Mn;Adwi>2vwxV^D8$^{DZ%tk->ceO@`Gcqq<E_cEVk*Lx z3=9mnSh9-q^E8=@Oc@v$iYz9Fh^aCvOs*1>;bi1s;b0VCD)N|oURZMSHn9vw-^udg z2C}!f^OLetlS|?=^7FGbnTy;&rm*JZC#Dn^`A*IeH((5$JXc(@o{f=#A)TR?wT7Wc zr$VWQ!G$4Ks+O&UA%(GqO`M^bv6j7tbpc}y`$9%WhC;q@h8o7AhzhkDMi+)yxmu1A zh7_h64v@MSrdm$0S|+Gkvv7tQrlOV#wHhWoYU?2eCxtWAFc)p8P^)1EE9L?l%!Sq9 zzHo*bmZCcqYBekb)$R%hd5*h6p@!9kAy%T6t%Ny^p@yxGv6iQXdjVq&4;$ED&o=Lq z;9-*V0EH1-VnIP_Udk=D)QXbSyp$pdQ1m^PQsKMBQe2Rle2X!!$QC3dD(%Y1GdWsX zhcR|?hjhJ-4Jc+<85kHe*^BHzY<my^iu@u_41yz|C<r9R0#d{r#gUs?T%4JoS6pN< z*;&SpF@AEaY~<wIGE%A_cN8gtl!DZ2vfg4ZE{V^{EG_}tToeP6iJUAY>%^EeIaanp z4XhrNfxzZ#vKA$PRDfIwRSV)KPW~<Hz?clSBu`#OgSiN-4V1a?Yr83D&zLe<QodLb ztO4YtB2d07iUawBC5j_4FEOXGB(=E6cJf+zYsR$6v9gwvl@x6B!RkTzttb-Y0+3Ek z)+qMGT!d$CF(u{}r7|!uM6o1JR+JT<yg)&VF=KM9tmNb;3K7y^6Znud=fE^i4p;PG z%$mGF(UUQ2@+(Do#>~lFN+yiilkJrf7;`o+P-<mlbepWElE7F2%BjM+3=9mSj0_CL zpx_4;6-Bv|<=7-ApH{i79Rji;6hwr9h;R@ADkC)6ief=*Nf1#5BC02!RBe)105L^D z1Vj+Tk^&LZAfgszpL8Vy1A{ckJ{|@J1}-KZMkr(|s+^p_?>qUGS_Y%m<Y4s!9C@H{ zWGu>`{E$zWtAK%l!HkiCp{Q`Og@&PW5y-$|kOJnS5)iu-M3jL9m>@~2eDZk?DaMM; z%QX%%)q@iusJx2eN=Yn93`#97%_-4jEYbmK;6YE96(F;~1p`Y;W^zdpGl=g6BD_Ha zNE0||+~SBYN-fAqOitD0C<2wVMHV3W8W7<Q$}>zwDYrn$VDfWqJ;vI}Vmc9QV6(v? zp<Ktnz@P&P36NF}Mh*@R<|2^TEsps3+{Dbh`1q*F>veLH!1ft{3^fE1`V0&VRZLb2 zRh*6m`8hfH3Wi3Sj76YW(q#1m0ZscN7mz}*4|qz8a&j`0^uPsgkr60Gu|tH6Z?P5U zCugUY6gf?<)zzp6XHHNeC;}%eQ2vHwHgFCC=Lc}|1}9uleNY4n&>~PtUxdic;FReL zvOW+*fRjl)h?N8)l0ifYhyYa_MHwJg7Kq4ZsApg($^kJ!39<;3O2C0p#0?5a#@t(s zX+_|qR1Z=k10ozjL@kH_M=vPEqc}=3GK=GjQj2dfmn9Z~h@2u&fJO17r<TNn3aZT9 n)I4y$yTzQ7ns<w-*zgupZcb4ssD=i|Y7y&X2Nv<kNA$V@wTHu5 delta 1988 zcmcZ_cRr5SiI<m)fq{Xc#o}U2;zr(VcE+g9mF#j%jEa*TSR@z~CU4{vW>lD*!0)n| zlgpTK@&-<p$qw8u5NS~*1_lNP1_p*=HU<U;4n__p4yGa{u;Opr1`x$syv`8CtjY`w z3?7pgaffWa&npU%{K01hl~iG1U<jDp%^Na#34b7?+GJlYnaM%|=fU<p6>x;85>#bi zV2D7nk9l$ozwG2(!DE8z3=9lOAQ>jGON!Jda|;_xE)mjZjGDYaD2i2sfq@}yvW1Y% zWNYCpMs1Mi1a%k~7&4Lc=uAE@9LN#HT98;&oEkM*Lqwm^XmW%|38U%cvm%m=>n1-J znaGjCR>PFdR<vw#ho}-`)a2EoK8!|_e~9WZMom@~QxP_0U|_h#l2x3ar^#Go$iTo* zWHLEMOjSh=6v&KBjAD#Jj2w(yjC@d9fRTfdgO!6(fT_r7@_Av&$p^$T7~R1vCvkDv zDDM2EtkmR^_>BDgY)$4OP+;F;&B;$pDK2uKTqbT%@5R8tkjx4)oq>UYmw|zSg@J*= z8RRQ2Mh1p-hFaDdh9ZLswHgK&hFG~;wi1RE#u_$phGxbXrdsw|jvCelj5Qn!85tQ0 z`NA1$7>i;m)M^;PYB@_7QkZHuv8uHSXQ*K+>Zqt!t6?IjI4zu^hPh}<g<1_WSS=UW zU@oi%PYP$KVJUi0p;p5}Q0=~O29<P%TJ8#k8devESczJ;5~ehU8n!;hTAmv21<W-( zV1K>Zd_;nWNzw@vHEgLBC8>ESMG|06VnIP_UdrT`QYw5!79bIp;)2xVTa0;=rKMdN z1tup->oA5*?vt*!F$YB@D3~?bi!4EGD-dA>B0y0Nj+i1J5Em5wn#@rgxtYbqnfZCe zMJAIyW$YLuCSO#LoLnR8F!`a3lq$$AMG7G0AU&F_x7dqI;&U>KOTf-33I)joO;(U~ zVvL6Bi&q2d0p&QbJ({dVkswtdXG7J4xKWcC<s2Aepqd;e&z6&eXawaxLK=l9f0EN- zjGZhmU#tkW4dl2YP}VF8XJBB^WQpQP%uCFvEJ-acvY5PC-kLEUYLUWZ4FwxbupUqz zEeZm;1*BV(HHtkk7vZ%iro`N$xXHZ=&Ws6@FDevDgZ1zsE6;%`pB$^`!I(68nW86S z(&P_{@{{C5CMzo`GA2)URZ3t?nVi5cxp}`*4kM$(WF3_R#sW~L7EWbgU=U?wU?>K~ z1E@$UN}VjnCOP?{%4Ka|kTrfF!XHEgfQUel$JmO(Kx|16Q3N82C!besl9vZDML`5a z5X6!K5z-){6l9-tAp--0G{`<41_lN$CLTs8WGX70oWSop`GZ;pqvqsD^#dGfAe$JA z(kDOU6XwcbU|=v~WMC-DoNT9IsGJ2dFdL+RxhMz3&IJ*9AOR*w+RC3Spe)5$uz9V< zL8f4EY6KN&QCumBC5b_)#icnVnv6wSAPqd|3A6xY7P#bKNy$tuDPjikT|k5@hyZCS z@|k>4TU6Kt#4iC6jtmS8QA|ZCQIlV48!?tnmeGk|1DgZ(wQ?B)1A`98*U*BWgM+yU zBzB7<K0Y@wGcP{=*5s`^IRap_^*{#dg9zQphPtA*pcv3(^#cJ-`yxA#1juz!Jf%fB zIhjd%;PSV~0OSI8h>&p<TXBAJc4|qH?c`=%je2kn1VwNWIOTvcGbA^Gvj;e-gHtUy zErP0sB2ZuzfeQR0M4kmFJ$I1xph6Uq1VFV*Q8Y*_21LYyh<Ff@03tv&Oi?mJJp)5g z3WyI%Y(=0H0QP(lH>e0<%)P~!Rs>Ea<sdaOAi@Sjl!6Fw)PX~nqa-7<IKC*g_!e_n zViAbQDbfXbnkPNABpy@{W#*>lfwR&r=A6{LTTI1<QB1ixMSh@isK{sXI=$rpgEqIK diff --git a/moondb/core.py b/moondb/core.py index a062a1c..8083d63 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, -- GitLab