GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-25 01:06:35 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

show error on invalid search

Browse source
This commit is contained in:
Damien Elmes 2017-02-02 21:00:58 +10:00
parent affede8079
commit 2fc47773b6
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
anki/find.py
View file

@ -38,7 +38,7 @@ class Finder(object):
tokens = self._tokenize(query) tokens = self._tokenize(query)
preds, args = self._where(tokens) preds, args = self._where(tokens)
if preds is None: if preds is None:
return [] raise Exception("invalidSearch")
order, rev = self._order(order) order, rev = self._order(order)
sql = self._query(preds, order) sql = self._query(preds, order)
try: try:

15
aqt/browser.py
View file

@ -121,11 +121,22 @@ class DataModel(QAbstractTableModel):
# the db progress handler may cause a refresh, so we need to zero out # the db progress handler may cause a refresh, so we need to zero out
# old data first # old data first
self.cards = [] self.cards = []
self.cards = self.col.findCards(txt, order=True) invalid = False
#self.browser.mw.pm.profile['fullSearch']) try:
self.cards = self.col.findCards(txt, order=True)
except Exception as e:
if str(e) == "invalidSearch":
self.cards = []
invalid = True
else:
raise
#print "fetch cards in %dms" % ((time.time() - t)*1000) #print "fetch cards in %dms" % ((time.time() - t)*1000)
self.endReset() self.endReset()
if invalid:
showWarning(_("Invalid search - please check for typing mistakes."))
def reset(self): def reset(self):
self.beginReset() self.beginReset()
self.endReset() self.endReset()