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

DB-API: surname_list not working; added tag map support

Browse Source
This commit is contained in:
Doug Blank 2015-05-25 21:06:44 -04:00
parent 1c4f827bf8
commit d38785740e
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@ import re
import os import os
import logging import logging
import shutil import shutil
import bisect
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@ -463,8 +462,10 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
"handles_func": self.get_tag_handles, "handles_func": self.get_tag_handles,
"add_func": self.add_tag, "add_func": self.add_tag,
"commit_func": self.commit_tag, "commit_func": self.commit_tag,
"has_handle_func": self.has_handle_for_tag,
"iter_func": self.iter_tags, "iter_func": self.iter_tags,
"count": self.get_number_of_tags, "count": self.get_number_of_tags,
"raw_func": self._get_raw_tag_data,
}) })
# 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)
@ -1449,13 +1450,13 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
""" """
if batch_transaction: if batch_transaction:
return return
name = conv_to_unicode(self._order_by_person_key(person), 'utf-8') #name = self._order_by_person_key(person)
i = bisect.bisect(self.surname_list, name) #i = bisect.bisect(self.surname_list, name)
if 0 < i <= len(self.surname_list): #if 0 < i <= len(self.surname_list):
if self.surname_list[i-1] != name: # if self.surname_list[i-1] != name:
self.surname_list.insert(i, name) # self.surname_list.insert(i, name)
else: #else:
self.surname_list.insert(i, name) # self.surname_list.insert(i, name)
def remove_from_surname_list(self, person): def remove_from_surname_list(self, person):
""" """
@ -1466,11 +1467,11 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
The function must be overridden in the derived class. The function must be overridden in the derived class.
""" """
name = self._order_by_person_key(person) name = self._order_by_person_key(person)
if isinstance(name, str): #if isinstance(name, str):
uname = name # uname = name
name = name.encode('utf-8') # name = name.encode('utf-8')
else: #else:
uname = str(name) # uname = str(name)
# FIXME: check database # FIXME: check database
def commit_family(self, family, trans, change_time=None): def commit_family(self, family, trans, change_time=None):
@ -2615,6 +2616,10 @@ class DBAPI(DbWriteBase, DbReadBase, UpdateCallback, Callback):
cur = self.dbapi.execute("select * from note where handle = ?", [key]) cur = self.dbapi.execute("select * from note where handle = ?", [key])
return cur.fetchone() != None return cur.fetchone() != None
def has_handle_for_tag(self, key):
cur = self.dbapi.execute("select * from tag where handle = ?", [key])
return cur.fetchone() != None
def has_gramps_id_for_person(self, key): def has_gramps_id_for_person(self, key):
cur = self.dbapi.execute("select * from person where gramps_id = ?", [key]) cur = self.dbapi.execute("select * from person where gramps_id = ?", [key])
return cur.fetchone() != None return cur.fetchone() != None