cram decks don't pull from other cram decks anymore

This commit is contained in:
Damien Elmes 2012-05-24 08:31:58 +09:00
parent 090e47eb7b
commit 44b4f18e6c
2 changed files with 5 additions and 1 deletions

View file

@ -236,6 +236,10 @@ class Finder(object):
return "type = %d" % n
elif val == "suspended":
return "c.queue = -1"
elif val == "regulardeck":
return "not c.odid"
elif val == "filterdeck":
return "c.odid"
elif val == "due":
return """
(c.queue in (2,3) and c.due <= %d) or

View file

@ -854,7 +854,7 @@ did = ? and queue = 2 and due <= ? limit ?""",
# gather card ids and sort
order = self._dynOrder(deck)
limit = " limit %d" % deck['limit']
search = deck['search'] + " -is:suspended"
search = deck['search'] + " -is:suspended is:regulardeck"
try:
ids = self.col.findCards(search, order=order+limit)
except: