Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Diff: fixed import of DictionaryDb; removed mistaken tag.gramps_id

Browse Source 
references in DictionartDb
This commit is contained in:
Doug Blank 2015-05-17 11:38:31 -04:00
parent acc6a652eb
commit 92f435d45b
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps/gen/merge/diff.py
View File

@ -28,7 +28,7 @@ from gramps.cli.user import User
from ..dbstate import DbState from ..dbstate import DbState
from gramps.cli.grampscli import CLIManager from gramps.cli.grampscli import CLIManager
from ..plug import BasePluginManager from ..plug import BasePluginManager
from ..db.dictionary import DictionaryDb from gramps.plugins.database.dictionarydb import DictionaryDb
from gramps.gen.lib.handle import HandleClass, Handle from gramps.gen.lib.handle import HandleClass, Handle
from gramps.gen.lib import * from gramps.gen.lib import *
from gramps.gen.lib.personref import PersonRef from gramps.gen.lib.personref import PersonRef

10
gramps/plugins/database/dictionarydb.py
View File

@ -402,7 +402,6 @@ class DictionaryDb(DbWriteBase, DbReadBase, UpdateCallback, Callback):
self.event_map = Map(Table(self._tables["Event"])) self.event_map = Map(Table(self._tables["Event"]))
self.event_id_map = {} self.event_id_map = {}
self.tag_map = Map(Table(self._tables["Tag"])) self.tag_map = Map(Table(self._tables["Tag"]))
self.tag_id_map = {}
self.metadata = Map(Table({"cursor_func": lambda: MetaCursor()})) self.metadata = Map(Table({"cursor_func": lambda: MetaCursor()}))
self.name_group = {} self.name_group = {}
self.undo_callback = None self.undo_callback = None
@ -867,11 +866,6 @@ class DictionaryDb(DbWriteBase, DbReadBase, UpdateCallback, Callback):
return Note.create(self.note_id_map[gramps_id]) return Note.create(self.note_id_map[gramps_id])
return None return None
def get_tag_from_gramps_id(self, gramps_id):
if gramps_id in self.tag_id_map:
return Tag.create(self.tag_id_map[gramps_id])
return None
def get_number_of_people(self): def get_number_of_people(self):
return len(self.person_map) return len(self.person_map)
@ -1238,7 +1232,6 @@ class DictionaryDb(DbWriteBase, DbReadBase, UpdateCallback, Callback):
else: else:
emit = "tag-add" emit = "tag-add"
self.tag_map[tag.handle] = tag.serialize() self.tag_map[tag.handle] = tag.serialize()
self.tag_id_map[tag.gramps_id] = self.tag_map[tag.handle]
# Emit after added: # Emit after added:
if emit: if emit:
self.emit(emit, ([tag.handle],)) self.emit(emit, ([tag.handle],))
@ -1423,7 +1416,7 @@ class DictionaryDb(DbWriteBase, DbReadBase, UpdateCallback, Callback):
database, preserving the change in the passed transaction. database, preserving the change in the passed transaction.
""" """
self.__do_remove(handle, transaction, self.tag_map, self.__do_remove(handle, transaction, self.tag_map,
self.tag_id_map, TAG_KEY) None, TAG_KEY)
def is_empty(self): def is_empty(self):
""" """
@ -1440,6 +1433,7 @@ class DictionaryDb(DbWriteBase, DbReadBase, UpdateCallback, Callback):
if handle in data_map: if handle in data_map:
obj = self._tables[KEY_TO_CLASS_MAP[key]]["class_func"].create(data_map[handle]) obj = self._tables[KEY_TO_CLASS_MAP[key]]["class_func"].create(data_map[handle])
del data_map[handle] del data_map[handle]
if data_id_map:
del data_id_map[obj.gramps_id] del data_id_map[obj.gramps_id]
self.emit(KEY_TO_NAME_MAP[key] + "-delete", ([handle],)) self.emit(KEY_TO_NAME_MAP[key] + "-delete", ([handle],))