|
@@ -26,6 +26,8 @@ import brotli
|
|
|
from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
|
|
from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
|
|
|
import urllib.parse
|
|
import urllib.parse
|
|
|
chrome_window=False
|
|
chrome_window=False
|
|
|
|
|
+#chrome_window=True
|
|
|
|
|
+
|
|
|
globalkw=None
|
|
globalkw=None
|
|
|
proxyport=8787
|
|
proxyport=8787
|
|
|
|
|
|
|
@@ -129,7 +131,8 @@ def get_next_job(db,repeat=False,repkw=None,repnum=None):
|
|
|
result['kw']=c['kw']
|
|
result['kw']=c['kw']
|
|
|
result['num']=c['num']
|
|
result['num']=c['num']
|
|
|
break
|
|
break
|
|
|
-
|
|
|
|
|
|
|
+ if repkw is not None:
|
|
|
|
|
+ result['kw']=repkw
|
|
|
if result.get('num') is not None:
|
|
if result.get('num') is not None:
|
|
|
cursor = db.query('select lat,lon,loc from lat_lon_loc where num ="'+str(result['num'])+'"')
|
|
cursor = db.query('select lat,lon,loc from lat_lon_loc where num ="'+str(result['num'])+'"')
|
|
|
for c in cursor:
|
|
for c in cursor:
|
