use same active/inactive limits for failed queue

This commit is contained in:
Damien Elmes 2010-10-23 16:15:42 +09:00
parent d1f1f914ad
commit 057414f404

View file

@ -210,10 +210,10 @@ tagId in %s)""" % (ids2str(nids))
return "" return ""
def _rebuildFailedCount(self): def _rebuildFailedCount(self):
self.failedSoonCount = self.s.scalar( self.failedSoonCount = self.s.scalar("""
"select count(*) from cards where type = 0 " select count(*) from cards where type = 0
"and combinedDue < :lim", and combinedDue < :lim """ + self.cardLimit("revActive", "revInactive"),
lim=self.dueCutoff) lim=self.dueCutoff)
def _rebuildRevCount(self): def _rebuildRevCount(self):
self.revCount = self.s.scalar(""" self.revCount = self.s.scalar("""
@ -238,8 +238,10 @@ and combinedDue < :lim """ + self.cardLimit("newActive", "newInactive"),
self.failedQueue = self.s.all(""" self.failedQueue = self.s.all("""
select id, factId, combinedDue from cards select id, factId, combinedDue from cards
where type = 0 and combinedDue < :lim where type = 0 and combinedDue < :lim
%s
order by combinedDue order by combinedDue
limit %d""" % self.queueLimit, lim=self.dueCutoff) limit %d""" % (self.cardLimit("revActive", "revInactive"),
self.queueLimit), lim=self.dueCutoff)
self.failedQueue.reverse() self.failedQueue.reverse()
def _fillRevQueue(self): def _fillRevQueue(self):