GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 06:22:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

handle cloze note types in changeModel()

Browse source
This commit is contained in:
Damien Elmes 2012-04-25 13:25:19 +09:00
parent 58aebc5b55
commit 12a80ef9c2
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
anki/models.py
View file

@ -375,7 +375,7 @@ select id from notes where mid = ?)""" % " ".join(map),
if fmap: if fmap:
self._changeNotes(nids, newModel, fmap) self._changeNotes(nids, newModel, fmap)
if cmap: if cmap:
self._changeCards(nids, newModel, cmap) self._changeCards(nids, m, newModel, cmap)
self.col.genCards(nids) self.col.genCards(nids)
def _changeNotes(self, nids, newModel, map): def _changeNotes(self, nids, newModel, map):
@ -397,14 +397,26 @@ select id from notes where mid = ?)""" % " ".join(map),
"update notes set flds=:flds,mid=:mid,mod=:m,usn=:u where id = :nid", d) "update notes set flds=:flds,mid=:mid,mod=:m,usn=:u where id = :nid", d)
self.col.updateFieldCache(nids) self.col.updateFieldCache(nids)
def _changeCards(self, nids, newModel, map): def _changeCards(self, nids, oldModel, newModel, map):
d = [] d = []
deleted = [] deleted = []
for (cid, ord) in self.col.db.execute( for (cid, ord) in self.col.db.execute(
"select id, ord from cards where nid in "+ids2str(nids)): "select id, ord from cards where nid in "+ids2str(nids)):
if map[ord] is not None: # if the src model is a cloze, we ignore the map, as the gui
# doesn't currently support mapping them
if oldModel['type'] == MODEL_CLOZE:
new = ord
if newModel['type'] != MODEL_CLOZE:
# if we're mapping to a regular note, we need to check if
# the destination ord is valid
if len(newModel['flds']) <= ord:
new = None
else:
# mapping from a regular note, so the map should be valid
new = map[ord]
if new is not None:
d.append(dict( d.append(dict(
cid=cid,new=map[ord],u=self.col.usn(),m=intTime())) cid=cid,new=new,u=self.col.usn(),m=intTime()))
else: else:
deleted.append(cid) deleted.append(cid)
self.col.db.executemany( self.col.db.executemany(