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

DB-API: support dbdid

Browse Source
This commit is contained in:
Doug Blank 2015-05-30 07:22:30 -04:00
parent 07673be08c
commit a213f92f0d
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gramps/plugins/database/dbapi.py
View File

@ -468,6 +468,7 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
"count": self.get_number_of_tags, "count": self.get_number_of_tags,
"raw_func": self._get_raw_tag_data, "raw_func": self._get_raw_tag_data,
}) })
self.set_save_path(directory)
# skip GEDCOM cross-ref check for now: # skip GEDCOM cross-ref check for now:
self.set_feature("skip-check-xref", True) self.set_feature("skip-check-xref", True)
self.set_feature("skip-import-additions", True) self.set_feature("skip-import-additions", True)
@ -560,11 +561,7 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
self.transaction = None self.transaction = None
self.abort_possible = False self.abort_possible = False
self._bm_changes = 0 self._bm_changes = 0
self._directory = directory
self._has_changed = False self._has_changed = False
self.full_name = None
self.path = None
self.brief_name = None
self.genderStats = GenderStats() # can pass in loaded stats as dict self.genderStats = GenderStats() # can pass in loaded stats as dict
self.owner = Researcher() self.owner = Researcher()
if directory: if directory:
@ -2455,7 +2452,7 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
# surname list # surname list
self.surname_list = self.get_metadata('surname_list') self.surname_list = self.get_metadata('surname_list')
self._directory = directory self.set_save_path(directory)
self.undolog = os.path.join(self._directory, DBUNDOFN) self.undolog = os.path.join(self._directory, DBUNDOFN)
self.undodb = DBAPIUndo(self, self.undolog) self.undodb = DBAPIUndo(self, self.undolog)
self.undodb.open() self.undodb.open()
@ -2474,9 +2471,14 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
def set_save_path(self, directory): def set_save_path(self, directory):
self._directory = directory self._directory = directory
if directory:
self.full_name = os.path.abspath(self._directory) self.full_name = os.path.abspath(self._directory)
self.path = self.full_name self.path = self.full_name
self.brief_name = os.path.basename(self._directory) self.brief_name = os.path.basename(self._directory)
else:
self.full_name = ""
self.path = ""
self.brief_name = ""
def write_version(self, directory): def write_version(self, directory):
"""Write files for a newly created DB.""" """Write files for a newly created DB."""
@ -2832,3 +2834,10 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
def redo(self, update_history=True): def redo(self, update_history=True):
return self.undodb.redo(update_history) return self.undodb.redo(update_history)
def get_dbid(self):
"""
We use the file directory name as the unique ID for
this database on this computer.
"""
return self.brief_name