eleksir/isida-4
1
Fork 0
Code Activity

fix: limit for gis output

Browse Source
This commit is contained in:
diSabler
2014-10-20 21:02:41 +04:00
parent 04b101c556
commit a9d0d5ef80
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/gis.py
View File

@@ -21,6 +21,8 @@
# # # #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
gis_limit = 20
def gweather_raw(type, jid, nick, text, fully): def gweather_raw(type, jid, nick, text, fully):
def get_date(body): def get_date(body):
tmp = get_tag_item(body,'FORECAST','day')+'.'+get_tag_item(body,'FORECAST','month') tmp = get_tag_item(body,'FORECAST','day')+'.'+get_tag_item(body,'FORECAST','month')
@@ -48,10 +50,10 @@ def gweather_raw(type, jid, nick, text, fully):
if len(text.strip()): if len(text.strip()):
text = text.lower() text = text.lower()
wzc = cur_execute_fetchall('select * from gis where code ilike %s or lcity ilike %s',(text,text)) wzc = cur_execute_fetchall('select * from gis where code ilike %s or lcity ilike %s limit %s',(text,text,gis_limit))
if not wzc: if not wzc:
ttext = '%%%s%%' % text ttext = '%%%s%%' % text
wzc = cur_execute_fetchall('select * from gis where code ilike %s or lcity ilike %s',(ttext,ttext)) wzc = cur_execute_fetchall('select * from gis where code ilike %s or lcity ilike %s limit %s',(ttext,ttext,gis_limit))
if not wzc and text.isdigit() and 4 <= len(text) <= 5: wzc = [(text,'','')] if not wzc and text.isdigit() and 4 <= len(text) <= 5: wzc = [(text,'','')]
if wzc: if wzc:
if len(wzc) == 1: if len(wzc) == 1: