From 083a50b3b3395ff7864ebffdffd9435d1bd7a93d Mon Sep 17 00:00:00 2001
From: Terry Liao <jinliang@student.unimelb.edu.au>
Date: Tue, 14 May 2019 20:53:24 +1000
Subject: [PATCH] bug fixed
---
.gitignore | 2 ++
.../general_process.cpython-37.pyc | Bin 883 -> 907 bytes
.../__pycache__/tweepy_search.cpython-37.pyc | Bin 2899 -> 2974 bytes
.../__pycache__/tweepy_stream.cpython-37.pyc | Bin 3236 -> 3209 bytes
tweet_havester/general_process.py | 8 ++++----
tweet_havester/tweepy_stream.py | 2 +-
6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0485ba8..0dcb913 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
\.DS_Store
+
+*.pyc
diff --git a/tweet_havester/__pycache__/general_process.cpython-37.pyc b/tweet_havester/__pycache__/general_process.cpython-37.pyc
index 499ebe437a399bd4deb4396de8a70396355733ba..c8018862355bf6199d19eef0f2404937d361da5d 100644
GIT binary patch
delta 430
zcmey&*3HiA#LLUYz`(%JFy~fG@<iTBK3)a}26hGp24@BahT=^Vr+C+=@YZrxDAX{y
zFvLpKa@BCvurFX($dJue6jZ}i%bvnl%UKu{&QQZyT$aKR%uvHp!%@Rt!&bwZ!k;2A
zhpm>ohP8${MbL(!hH(L74f8_ATAmu76hTRb6rpUUqID_4HQXs8HVie~!3>(Beo>sc
zsX0mcrA2wEQEbJPDS4^Fl~EjtDXBS$nJKAJtOcn>B^gnZ(-|!k-9m1$rX}VSr)shl
zu`n<&6mfzG4iLcxB3LKyV^m_~p8Swe%#QaKYe{)(YRN6u-29Z(oLg+knI)O2#Zl}j
zi6x1}sU^3VGE<6JLAt<N!G?g0yTy{0lbAkPpGk&MY_bnin~fPLu$cH5*%&!Mkcoql
z1w=ElFmf^RFoD=Cj4Vt{j4;T-#KFkL$iv9NSR^r-gW1?Z5M+r2h!8_1#2FYEZgJS;
W=BJeAq}nlpf*<4zkX8;xE+zmx-dqa+
delta 397
zcmeBX|IEhg#LLUYz`(#D<9#E>VIprO9}fcq13Lo)gEIpIL-C4<Q@radlxmn<7-FSr
zIcqp;*cUJ?WXNVKN~z(jWiRwgVF+d@^b2RGVX5J$VXtAUVNKyp;hV!&%T>c#!<@oz
z!%)MxfU$;oA!99f4R;E^BtwcoHdE1(6u}y<6d@ai8m?dlO<})VoVlqvN%^Hkd8xP9
ziYrs{QY&w9B&MY1Bxa^?rru&LNG&SKxHY+u(L(+fYg%GXajGU;5hnu!LlGZ{-~|!f
zAcAZ1DMlrK0R{#JO{QC{Ir-(OMYq@sic(WDlS?#tZn2h>r>2(NV$ID@NzI93OU^9G
zOf8OLPf09EEKV)C#gv&+1PYBJuvuVJLFP|(WRhW&oE*p0W@Z2iD<(chHbxE*Wa40C
x0n=PeJWOm%9L!9NFv!8g!N|qP!^pu{Bt2Py*;q;p<UVN-A&E*zP0nSO0|3X=S_l9D
diff --git a/tweet_havester/__pycache__/tweepy_search.cpython-37.pyc b/tweet_havester/__pycache__/tweepy_search.cpython-37.pyc
index 477cbf31596d50ad27e7ef9bd5185cabc4d57899..26a16ae86d26beeec6c17682d00b640f4ed31c2d 100644
GIT binary patch
delta 513
zcmcaCHcy<-iI<m)fq{YH&(vEn%6t>~Bp8z>s;gNu=CDMuq%fo~<*?+kMzJz7q%fo~
z=dk6nN3nz1j5!=pobC)MEGeul3@NP5Oi^4ZY$@z53{l)08`2mVc{e|2<Y8tMocx6)
zp7GJ-5LPwGT_sFe%r#6|3^j}?ti4PNSW*}lGP*FtE|@%-HCa`!gnxlR4SNkkmf%9B
zT8<iy6ozc(q60Oo3xsMo7BVt2)UYfNnyk#$!6-a=4O{(W1NJC3O$G*rVvWfY*p(QW
zCU0f0X5^V{$f3!oH949iM|n>PTQfr~X9-6QQ!`@<Yc@ksM+xTwt`s(qVTD;G+$rpn
z&u~bZb4W52Ppjcvz*@r%lBwZH;WTHc<;Y_yoL0k;!j;WZG_8g`g;Sg%g<FiFmOX`~
zmZOGi0ncO^PI*I~8lDsm8-^OD1-vypAl-%U!Wkg;7ETLiDB(`wZDwR-D9j3HNMQ(O
z(Bzw(!>OnKQiFkk;bjT~14ET`aY<rPi9(`6UTV2QQGRJ&ib8&#LUC$hQF6xQwVXPP
ze3Nf+8VlZH&PmO?#Zr=)n|h0-JTbFmGA~y#n>)z+E|c51<XPF6co?}RFXGY^<S7zi
nU|_h#lwVwA#lXN&WH$LaSB97n0|NsGBMkB|@-T8R^H~D`LQ8;?
delta 524
zcmbOyep!sqiI<m)fq{WR;pL5(INphT5{yw3)zyrda+q^jqF5LiQW#R0b69iPqS(M}
z#vJx24tItWmK4?&h7{IjrYO!7wiNajhA6I$9che=Je%J$@-Q<BO#Z_X&-iL`46B;t
zp%SJn<{G9fh8o5c)?TIsEGdi&8C@7+S4^JGnyhP9!oNVEhP{R%OK>4mEk}t^4M#I0
zBSQ^G3PUz?(TN(?1;RBP3qc|*3xp>tvvn|vOkTrQ&r~EnS%W>6O@o1fp;&8jH@gxu
zBM0N;b?nuQ+>^C9G#Pm&hj8T7&nw|bVFj62(NV+X!Vud~%U#1%!!5~B%TvRX!Y0X3
zTv5ZhfVGAjYy(FMyE#KGM;=pQMGZ#^M>b1QMGbojyEsD%rx-&mdkRY}M-A5k&Kk}d
z)*5z6hJ{Rw3>9iMoGuKpatL!%xIiY`Fw`(D;L@q#0U2C)A)KLvt(l>gv#=tZp@bua
z8|0+ItZ;@DhF}Iw9={?b1_p-73e0k{MLY})3`L9#3=CC*#U+VFB?^fOd8y?JMfs(9
zDU)w->M(LoX5})T?8#NE<OcG)4Jh&$xfnT^SQvR2MHpEaxfuBvSr}Ou*%&z{KjYHm
l;Vu$kU|_h#lwVwAGFgE;Lqvdqfq{b&0(lsD7&(~vtO3irbb$Z>
diff --git a/tweet_havester/__pycache__/tweepy_stream.cpython-37.pyc b/tweet_havester/__pycache__/tweepy_stream.cpython-37.pyc
index 7c2944ac09c80c5722949a52ed3eb6e27d4e1422..c3c196dc734728bffd04af690dbb764be92b9924 100644
GIT binary patch
delta 502
zcmZ1?*(u5A#LLUYz`($;an7xnm)slq?l7~>U|?XVY@7UnIY4ItTMb(cLl*l&rdo~~
zjueJ$=AwccmIWL&919s48ETjpaMZAaSxgH!CYP{eFmg`5%OX3OkyU)M3TvFO0?1@W
zCPpqel$ku8)sOuaYe7+FUdiNFtQw4llZDy*+4L9~7>W!hCvZtjZeSB(6rMblZ3d&+
zWIc9qM$^e|?8_MSC%*-=Svg!7%{O~-1TeapF)%RPVoS@+DM>BT<Sya`8DR$^>_HNo
zi3OSQCHdK@dAGQWONvqxbK?_>QWJ|@K`Pupggc1vnEZfKgVmaWfx&h%FPEj15lGM&
zM3{gGb`aqRBCJ7<6E$UEU;s%JvoSC*a4>Q(aj+GcPVVKpmI9Kw#gbo;npdO(QqK({
zKss-6x>h8o7L;V>=N0LLT*jK5lV6;w$zBBVKoKbPZ!sp`VoWOnxw{DDgIkQLMf@QB
zU_t=I0=dv@@^Nl?IS@-z0Bp%Eru^btY$fHXsRflq93W+ulUaED1k^!HkPC}It||gK
OU3_vSj|Q_kpBMm7n{ki;
delta 522
zcmeB_Tq4Qm#LLUYz`(%Z{^mvuC(lN{JIrhg7#J8T`zC*24lt=<Z)Rj<C}CT`Uc*+y
zkj1f(sg|RLBZVQGxu~Lqa{*Tk$3jL%h8pGtTs7=q7SjT*$vG?;D%?dNQ*W_k73b&O
zV$I1<Oero>U|?Xl#avucbc?m1C^N5Q@<$d4Zmxo&{N&W);`o%L$sDZlqDmmgFfuW6
z!J!Nz$K)zjKh`331_p-7=UFuvjVAwK^=C6+U|=XRn(WJ_!zePjifx9ZIY@vXP6&Wl
z><kPHW|Otqmq~(j-{LIEC`wIC$;?Z?#TEi)7MV?c#qPprv00xZfKdu$#4Wb8%$$<c
zB2DfhUXT&?Ai`ntOimdAHxSbuM0kJ*&&fwQHCSyJ7#Qp(f8w;1G6o5nfCy6%0kXTu
z3B<CQ?8_!0YR1680Fo$XV_;z5VB}!pU@J14T*P(F6C`tsCBGmwuSf-?o*P7fbl&20
ztw>HSD9Oyv1AG4#YjRG0ajGVJ5y+*GFlJ1=#h6y)0McSVc_OzM*g@Wt*Ko@-+Dtyf
iEyHLv`6aiXfCfkb$mSxDZABm_iBFE>(O}l#69WJ@Pj|Ke
diff --git a/tweet_havester/general_process.py b/tweet_havester/general_process.py
index fdeac5d..5e09365 100644
--- a/tweet_havester/general_process.py
+++ b/tweet_havester/general_process.py
@@ -15,15 +15,15 @@ def data_process(tweet,model):
return None
location = tweet['location']
create_time = tweet['create_time']
-
+ flag = False
for city in cities:
#the location contains target city names
if city in location.lower():
#generalize city name
location=city
- else:
- return None
-
+ flag = True
+ if(not flag):
+ return None
p_tweet={
'_id':id,
"create_time":create_time,
diff --git a/tweet_havester/tweepy_stream.py b/tweet_havester/tweepy_stream.py
index 7087200..cfd8180 100644
--- a/tweet_havester/tweepy_stream.py
+++ b/tweet_havester/tweepy_stream.py
@@ -37,7 +37,7 @@ class listener(StreamListener):
id_doc = {"_id":str(dic["user_id"]),"user_name":content['user']['name'],"isSearched":False}
p_dic = gp.data_process(dic,self.model)
if p_dic != None:
- process_db.save(p_dic)
+ pc_db.save(p_dic)
id_db.save(id_doc)
db.save(dic)
# print("success")
--
GitLab