|
|
@@ -101,6 +101,18 @@ def keyin_keyword(driver, keyword):
|
|
|
time.sleep(3)
|
|
|
|
|
|
|
|
|
+def scan_job(db):
|
|
|
+ result={}
|
|
|
+ cursor = db.query('select t1.num,next-prev as diff from google_poi.conv_log t1, (SELECT num,max(id) mid FROM google_poi.conv_log group by num ) t2 where t1.id=t2.mid having diff>0 order by rand()')
|
|
|
+ for c in cursor:
|
|
|
+ result['num']=c['num']
|
|
|
+ break
|
|
|
+ cursor = db.query('select lat,lon,loc from lat_lon_loc where num ="'+str(result['num'])+'"')
|
|
|
+ for c in cursor:
|
|
|
+ result['lat']=c['lat']
|
|
|
+ result['lon']=c['lon']
|
|
|
+ result['loc']=c['loc']
|
|
|
+ return result
|
|
|
|
|
|
def get_next_job(db,repeat=False,repkw=None,repnum=None):
|
|
|
global globalkw
|
|
|
@@ -354,7 +366,10 @@ def main():
|
|
|
if len(sys.argv) > 3 :
|
|
|
repkw=sys.argv[1]
|
|
|
repnum=sys.argv[2]
|
|
|
- job=get_next_job(db,repeat=True,repkw=repkw,repnum=repnum)
|
|
|
+ if 'SCAN' in repkw:
|
|
|
+ job=scan_job(db)
|
|
|
+ else:
|
|
|
+ job=get_next_job(db,repeat=True,repkw=repkw,repnum=repnum)
|
|
|
else:
|
|
|
job=get_next_job(db)
|
|
|
print(job)
|
jared