GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

support searching for card type

Browse source
This commit is contained in:
Damien Elmes 2009-05-06 13:32:00 +09:00
parent 91f06b31d6
commit 0b9df42400
1 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
anki/deck.py
View file

@ -46,7 +46,9 @@ REV_CARDS_OLD_FIRST = 0
REV_CARDS_NEW_FIRST = 1 REV_CARDS_NEW_FIRST = 1
REV_CARDS_DUE_FIRST = 2 REV_CARDS_DUE_FIRST = 2
REV_CARDS_RANDOM = 3 REV_CARDS_RANDOM = 3
SEARCH_TAG = 0
SEARCH_TYPE = 1
SEARCH_PHRASE = 2
DECK_VERSION = 34 DECK_VERSION = 34
deckVarsTable = Table( deckVarsTable = Table(
@ -1735,20 +1737,25 @@ where id = :id""", pending)
isNeg = token.startswith("-") isNeg = token.startswith("-")
if isNeg: if isNeg:
token = token[1:] token = token[1:]
isTag = token.startswith("tag:") if token.startswith("tag:"):
if isTag:
# tag
token = token[4:] token = token[4:]
res.append((token, isNeg, isTag)) type = SEARCH_TAG
elif token.startswith("type:"):
token = token[5:]
type = SEARCH_TYPE
else:
type = SEARCH_PHRASE
res.append((token, isNeg, type))
return res return res
def _findCards(self, query): def _findCards(self, query):
"Find facts matching QUERY." "Find facts matching QUERY."
tquery = "" tquery = ""
fquery = "" fquery = ""
qquery = ""
args = {} args = {}
for c, (token, isNeg, isTag) in enumerate(self._parseQuery(query)): for c, (token, isNeg, type) in enumerate(self._parseQuery(query)):
if isTag: if type == SEARCH_TAG:
# a tag # a tag
if tquery: if tquery:
if isNeg: if isNeg:
@ -1768,6 +1775,25 @@ and cards.factId = facts.id """
tquery += """ tquery += """
select cardId from cardTags where select cardId from cardTags where
cardTags.tagId in %s""" % ids2str(ids) cardTags.tagId in %s""" % ids2str(ids)
elif type == SEARCH_TYPE:
if qquery:
if isNeg:
qquery += " except "
else:
qquery += " intersect "
elif isNeg:
qquery += "select id from cards except "
if token in ("rev", "new", "fail"):
if token == "rev":
n = 1
elif token == "new":
n = 2
else:
n = 0
qquery += "select id from cards where type = %d" % n
elif token == "due":
qquery += ("select id from cards where "
"type in (0,1) and isDue = 1")
else: else:
# a field # a field
if fquery: if fquery:
@ -1781,16 +1807,18 @@ cardTags.tagId in %s""" % ids2str(ids)
args["_ff_%d" % c] = "%"+token+"%" args["_ff_%d" % c] = "%"+token+"%"
q = "select factId from fields where value like :_ff_%d" % c q = "select factId from fields where value like :_ff_%d" % c
fquery += q fquery += q
return (tquery, fquery, args) return (tquery, fquery, qquery, args)
def findCardsWhere(self, query): def findCardsWhere(self, query):
(tquery, fquery, args) = self._findCards(query) (tquery, fquery, qquery, args) = self._findCards(query)
q = "" q = ""
x = [] x = []
if tquery: if tquery:
x.append(" id in (%s)" % tquery) x.append(" id in (%s)" % tquery)
if fquery: if fquery:
x.append(" factId in (%s)" % fquery) x.append(" factId in (%s)" % fquery)
if qquery:
x.append(" id in (%s)" % qquery)
if x: if x:
q += " and ".join(x) q += " and ".join(x)
return q, args return q, args