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

9742: Tidy up get_raw_*_data methods

Browse Source 
Remove protected methods.
Avoid the use of table maps.
This commit is contained in:
Nick Hall
2016-10-14 18:01:33 +01:00
parent a158c9cba8
commit 8548f16ae2
2 changed files with 102 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
gramps/plugins/db/dbapi/dbapi.py
View File

@ -1662,7 +1662,7 @@ class DBAPI(DbGeneric):
rows = self.dbapi.fetchall()
return [row[0] for row in rows]
def _get_raw_person_data(self, key):
def get_raw_person_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
@ -1671,6 +1671,86 @@ class DBAPI(DbGeneric):
if row:
return pickle.loads(row[0])
def get_raw_family_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM family WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def get_raw_source_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM source WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def get_raw_citation_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM citation WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def get_raw_event_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM event WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def get_raw_media_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM media WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def get_raw_place_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM place WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def get_raw_repository_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM repository WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def get_raw_note_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM note WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def get_raw_tag_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute("SELECT blob_data FROM tag WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def _get_raw_person_from_id_data(self, key):
self.dbapi.execute(
"SELECT blob_data FROM person WHERE gramps_id = ?", [key])
@ -1678,15 +1758,6 @@ class DBAPI(DbGeneric):
if row:
return pickle.loads(row[0])
def _get_raw_family_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM family WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def _get_raw_family_from_id_data(self, key):
self.dbapi.execute(
"SELECT blob_data FROM family WHERE gramps_id = ?", [key])
@ -1694,15 +1765,6 @@ class DBAPI(DbGeneric):
if row:
return pickle.loads(row[0])
def _get_raw_source_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM source WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def _get_raw_source_from_id_data(self, key):
self.dbapi.execute(
"SELECT blob_data FROM source WHERE gramps_id = ?", [key])
@ -1710,15 +1772,6 @@ class DBAPI(DbGeneric):
if row:
return pickle.loads(row[0])
def _get_raw_citation_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM citation WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def _get_raw_citation_from_id_data(self, key):
self.dbapi.execute(
"SELECT blob_data FROM citation WHERE gramps_id = ?", [key])
@ -1726,15 +1779,6 @@ class DBAPI(DbGeneric):
if row:
return pickle.loads(row[0])
def _get_raw_event_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM event WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def _get_raw_event_from_id_data(self, key):
self.dbapi.execute(
"SELECT blob_data FROM event WHERE gramps_id = ?", [key])
@ -1742,15 +1786,6 @@ class DBAPI(DbGeneric):
if row:
return pickle.loads(row[0])
def _get_raw_media_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM media WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def _get_raw_media_from_id_data(self, key):
self.dbapi.execute(
"SELECT blob_data FROM media WHERE gramps_id = ?", [key])
@ -1758,15 +1793,6 @@ class DBAPI(DbGeneric):
if row:
return pickle.loads(row[0])
def _get_raw_place_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM place WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def _get_raw_place_from_id_data(self, key):
self.dbapi.execute(
"SELECT blob_data FROM place WHERE gramps_id = ?", [key])
@ -1774,15 +1800,6 @@ class DBAPI(DbGeneric):
if row:
return pickle.loads(row[0])
def _get_raw_repository_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM repository WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def _get_raw_repository_from_id_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
@ -1792,15 +1809,6 @@ class DBAPI(DbGeneric):
if row:
return pickle.loads(row[0])
def _get_raw_note_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute(
"SELECT blob_data FROM note WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def _get_raw_note_from_id_data(self, key):
self.dbapi.execute(
"SELECT blob_data FROM note WHERE gramps_id = ?", [key])
@ -1808,14 +1816,6 @@ class DBAPI(DbGeneric):
if row:
return pickle.loads(row[0])
def _get_raw_tag_data(self, key):
if isinstance(key, bytes):
key = str(key, "utf-8")
self.dbapi.execute("SELECT blob_data FROM tag WHERE handle = ?", [key])
row = self.dbapi.fetchone()
if row:
return pickle.loads(row[0])
def get_gender_stats(self):
"""
Returns a dictionary of