split q/a line format up so it can be easily modified in a plugin

This commit is contained in:
Damien Elmes 2011-04-18 08:05:12 +09:00
parent c7fb1146da
commit 1c7cf73c5d

View file

@ -205,9 +205,9 @@ class DeckModel(QAbstractTableModel):
type = self.columnType(col) type = self.columnType(col)
c = self.getCard(index) c = self.getCard(index)
if type == "question": if type == "question":
return self.formatQA(c.q()) return self.question()
elif type == "answer": elif type == "answer":
return self.formatQA(c.a()) return self.answer()
elif type == "factFld": elif type == "factFld":
f = c.fact() f = c.fact()
return self.formatQA(f.fields[f.model().sortIdx()]) return self.formatQA(f.fields[f.model().sortIdx()])
@ -236,15 +236,13 @@ class DeckModel(QAbstractTableModel):
elif type == "factGroup": elif type == "factGroup":
return self.browser.mw.deck.groupName(c.fact().gid) return self.browser.mw.deck.groupName(c.fact().gid)
# def limitContent(self, txt): def question(self):
# if "<c>" in txt: return self.formatQA(c.a())
# matches = re.findall("(?s)<c>(.*?)</c>", txt)
# return " ".join(matches) def answer(self):
# else: return self.formatQA(c.a())
# return txt
def formatQA(self, txt): def formatQA(self, txt):
#s = self.limitContent(s)
s = txt.replace("<br>", u" ") s = txt.replace("<br>", u" ")
s = s.replace("<br />", u" ") s = s.replace("<br />", u" ")
s = s.replace("\n", u" ") s = s.replace("\n", u" ")
@ -255,7 +253,7 @@ class DeckModel(QAbstractTableModel):
def nextDue(self, c, index): def nextDue(self, c, index):
if c.type == 0: if c.type == 0:
return _("(new)") return str(c.due) #_("(new)")
elif c.type == 1: elif c.type == 1:
date = c.due date = c.due
elif c.type == 2: elif c.type == 2: