From 44b4f18e6cf28df2916dc24c0ee3324d143b9daf Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 24 May 2012 08:31:58 +0900 Subject: [PATCH] cram decks don't pull from other cram decks anymore --- anki/find.py | 4 ++++ anki/sched.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/anki/find.py b/anki/find.py index 314a38d50..2d538aaca 100644 --- a/anki/find.py +++ b/anki/find.py @@ -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 diff --git a/anki/sched.py b/anki/sched.py index aaab1e53d..aa0091a5b 100644 --- a/anki/sched.py +++ b/anki/sched.py @@ -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: