From 9af5d4d5ed1b9e3f0245c9c3383503d98f27221c Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Mon, 10 Jan 2011 18:58:59 +0900
Subject: [PATCH] apply limit to new card count

---
 anki/deck.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/anki/deck.py b/anki/deck.py
index c16314d4a..fda6c2beb 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -1106,8 +1106,7 @@ where id = :id""", vals)
         next = self.earliestTime()
         if next:
             # all new cards except suspended
-            newCount = self.s.scalar("""
-select count() from cards where relativeDelay = 2 and type != -1""")
+            newCount = self.newCardsDueBy(self.dueCutoff + 86400)
             newCardsTomorrow = min(newCount, self.newCardsPerDay)
             cards = self.cardsDueBy(self.dueCutoff + 86400)
             msg = _('''\
@@ -1165,6 +1164,14 @@ limit 1""" % self.delay0))
             "select count(*) from cards c where type between 0 and 1 "
             "and combinedDue < :lim"), lim=time)
 
+    def newCardsDueBy(self, time):
+        "Number of new cards due at TIME."
+        return self.s.scalar(
+            self.cardLimit(
+            "newActive", "newInactive",
+            "select count(*) from cards c where type = 2 "
+            "and combinedDue < :lim"), lim=time)
+
     def deckFinishedMsg(self):
         spaceSusp = ""
         c= self.spacedCardCount()