Merge changes from lp:~realender/calibre/store.

This commit is contained in:
John Schember 2011-12-06 19:31:30 -05:00
commit 3c8976b89b
2 changed files with 4 additions and 4 deletions

View File

@ -40,9 +40,9 @@ class ChitankaStore(BasicStoreConfig, StorePlugin):
d.exec_() d.exec_()
def search(self, query, max_results=10, timeout=60): def search(self, query, max_results=10, timeout=60):
# check for cyrilic symbols before performing search # check for cyrillic symbols before performing search
uquery = unicode(query.strip(), 'utf-8') uquery = unicode(query.strip(), 'utf-8')
reObj = re.search(u'^[а-яА-Я\\d]{4,}[а-яА-Я\\d\\s]*$', uquery) reObj = re.search(u'^[а-яА-Я\\d\\s]{3,}$', uquery)
if not reObj: if not reObj:
return return

View File

@ -46,9 +46,9 @@ class eKnigiStore(BasicStoreConfig, StorePlugin):
d.exec_() d.exec_()
def search(self, query, max_results=10, timeout=60): def search(self, query, max_results=10, timeout=60):
# check for cyrilic symbols before performing search # check for cyrillic symbols before performing search
uquery = unicode(query.strip(), 'utf-8') uquery = unicode(query.strip(), 'utf-8')
reObj = re.search(u'^[а-яА-Я\\d]{2,}[а-яА-Я\\d\\s]*$', uquery) reObj = re.search(u'^[а-яА-Я\\d\\s]{2,}$', uquery)
if not reObj: if not reObj:
return return