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

handle to ref conversions

Browse Source 
svn: r6239
This commit is contained in:
Don Allingham
2006-03-31 04:19:06 +00:00
parent 97ee7bdc17
commit 6c0e2b86d6
19 changed files with 179 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/Ancestors.py
View File

@@ -517,17 +517,17 @@ class ComprehensiveAncestorsReport (Report.Report):
def abbrev_born_died (self, person):
ret = ''
birth_handle = person.get_birth_handle ()
if birth_handle:
birth = self.database.get_event_from_handle(birth_handle)
birth_ref = person.get_birth_ref()
if birth_ref:
birth = self.database.get_event_from_handle(birth_ref.ref)
date = birth.get_date ()
if date:
ret += _(" b. %(birth_date)s") % {'birth_date': date}
ret += self.cite_sources (birth.get_source_references ())
death_handle = person.get_death_handle ()
if death_handle:
death = self.database.get_event_from_handle(death_handle)
death_ref = person.get_death_ref()
if death_ref:
death = self.database.get_event_from_handle(death_ref.ref)
date = death.get_date ()
if date:
ret += _(" d. %(death_date)s") % {'death_date': date}
@@ -538,16 +538,16 @@ class ComprehensiveAncestorsReport (Report.Report):
def long_born_died (self, person):
ret = ''
born_info = None
birth_handle = person.get_birth_handle ()
if birth_handle:
birth = self.database.get_event_from_handle(birth_handle)
birth_ref = person.get_birth_ref()
if birth_ref:
birth = self.database.get_event_from_handle(birth_ref.ref)
born_info = self.event_info (birth)
if born_info:
ret = ", " + _("born") + born_info
death_handle = person.get_death_handle()
if death_handle:
death = self.database.get_event_from_handle(death_handle)
death_ref = person.get_death_ref()
if death_ref:
death = self.database.get_event_from_handle(death_ref.ref)
died_info = self.event_info (death)
if died_info:
if born_info:
@@ -803,7 +803,7 @@ class ComprehensiveAncestorsReport (Report.Report):
paras = []
names = person.get_alternate_names ()
event_handles = person.get_event_list ()
event_ref = person.get_event_ref_list ()
addresses = person.get_address_list ()
if (len (event_handles) + len (addresses) + len (names)) > 0:
paras.append ((self.doc.start_paragraph, ['AR-SubEntry']))
@@ -819,20 +819,20 @@ class ComprehensiveAncestorsReport (Report.Report):
': ' + name.get_regular_name ()]))
paras.append ((self.doc.end_paragraph, []))
for event_handle in [person.get_birth_handle (), person.get_death_handle ()]:
if not event_handle:
for event_ref in [person.get_birth_ref(), person.get_death_ref()]:
if not event_ref:
continue
event = self.database.get_event_from_handle(event_handle)
event = self.database.get_event_from_handle(event_ref.ref)
note = event.get_note ()
note_format = event.get_note_format ()
if note and (note_format != 0):
paras.append ((self.doc.write_note, [note, format,
'AR-Details']))
for event_handle in event_handles:
if not event_handle:
for event_ref in event_refs:
if not event_ref:
continue
event = self.database.get_event_from_handle(event_handle)
event = self.database.get_event_from_handle(event_ref.ref)
paras.append ((self.doc.start_paragraph, ['AR-Details']))
paras.append ((self.doc.write_text, [self.event_info (event)]))
paras.append ((self.doc.end_paragraph, []))

45
src/plugins/Calendar.py
View File

@@ -265,32 +265,25 @@ class Calendar(Report.Report):
self.database.get_person_handles(sort_handles=False))
for person_handle in people:
person = self.database.get_person_from_handle(person_handle)
birth_handle = person.get_birth_handle()
birth_ref = person.get_birth_ref()
birth_date = None
if birth_handle:
birth_event = self.database.get_event_from_handle(birth_handle)
birth_date = birth_event.get_date()
if birth_date == "":
birth_date = None
else:
birth_date_obj = birth_event.get_date_object()
death_handle = person.get_death_handle()
if birth_ref:
birth_event = self.database.get_event_from_handle(birth_ref.ref)
birth_date = birth_event.get_date_object()
death_ref = person.get_death_ref()
death_date = None
if death_handle:
death_event = self.database.get_event_from_handle(death_handle)
death_date = death_event.get_date()
if death_date == "": # BUG: couldn't remove event
death_date = None
else:
death_date_obj = death_event.get_date_object()
if death_ref:
death_event = self.database.get_event_from_handle(death_ref.ref)
death_date = death_event.get_date_object()
if death_date == None:
alive = True # well, until we get probably_alive in here
else:
alive = False
if self["birthdays"] and birth_date != None and ((self["alive"] and alive) or not self["alive"]):
year = birth_date_obj.get_year()
month = birth_date_obj.get_month()
day = birth_date_obj.get_day()
year = birth_date.get_year()
month = birth_date.get_month()
day = birth_date.get_day()
age = self["year"] - year
# add some things to handle maiden name:
father_lastname = None # husband, actually
@@ -325,16 +318,16 @@ class Calendar(Report.Report):
spouse_name = self.get_short_name(spouse)
short_name = self.get_short_name(person)
if self["alive"]:
spouse_death_handle = spouse.get_death_handle()
if spouse_death_handle != None:
spouse_death_ref = spouse.get_death_ref()
if spouse_death_ref:
# there is a death event, maybe empty though
spouse_death_event = self.database.get_event_from_handle(spouse_death_handle)
spouse_death_event = self.database.get_event_from_handle(spouse_death_ref.ref)
if spouse_death_event != None:
spouse_death_date = spouse_death_event.get_date()
if spouse_death_date != "": # BUG: couldn't remove event
spouse_death_date = spouse_death_event.get_date_object()
if spouse_death_date: # BUG: couldn't remove event
continue
for event_handle in fam.get_event_list():
event = self.database.get_event_from_handle(event_handle)
for event_ref in fam.get_event_ref_list():
event = self.database.get_event_from_handle(event_ref.ref)
event_obj = event.get_date_object()
year = event_obj.get_year()
month = event_obj.get_month()

4
src/plugins/Checkpoint.py
View File

@@ -47,7 +47,7 @@ import gtk.glade
#
#-------------------------------------------------------------------------
from QuestionDialog import OkDialog, ErrorDialog
import WriteXML
import GrampsDb
from PluginUtils import Tool, register_tool
import Utils
import GrampsDisplay
@@ -245,7 +245,7 @@ class Checkpoint(Tool.Tool):
"""
proc = popen2.Popen3(cmd, True)
if checkin:
xmlwrite = WriteXML.XmlWriter(self.db,self.callback,False,False)
xmlwrite = GrampsDb.XmlWriter(self.db,self.callback,False,False)
xmlwrite.write_handle(proc.tochild)
else:
pass

30
src/plugins/EventCmp.py
View File

@@ -332,35 +332,34 @@ class DisplayChart:
for individual_id in self.my_list:
individual = self.db.get_person_from_handle(individual_id)
name = individual.get_primary_name().get_name()
birth_handle = individual.get_birth_handle()
birth_ref = individual.get_birth_ref()
bdate = ""
bplace = ""
if birth_handle:
birth = self.db.get_event_from_handle(birth_handle)
if birth_ref:
birth = self.db.get_event_from_handle(birth_ref.ref)
bdate = DateHandler.get_date(birth)
bplace_handle = birth.get_place_handle()
if bplace_handle:
bplace = self.db.get_place_from_handle(bplace_handle).get_title()
death_handle = individual.get_death_handle()
death_ref = individual.get_death_ref()
ddate = ""
dplace = ""
if death_handle:
death = self.db.get_event_from_handle(death_handle)
if death_ref:
death = self.db.get_event_from_handle(death_ref.ref)
ddate = DateHandler.get_date(death)
dplace_handle = death.get_place_handle()
if dplace_handle:
dplace = self.db.get_place_from_handle(dplace_handle).get_title()
map = {}
elist = individual.get_event_list()[:]
for ievent_handle in elist:
if not ievent_handle:
for ievent_ref in individual.get_event_ref_list():
if not ievent_ref:
continue
ievent = self.db.get_event_from_handle(ievent_handle)
ievent = self.db.get_event_from_handle(ievent_ref.ref)
event_name = ievent.get_name()
if map.has_key(event_name):
map[event_name].append(ievent_handle)
map[event_name].append(ievent_ref.ref)
else:
map[event_name] = [ievent_handle]
map[event_name] = [ievent_ref.ref]
first = 1
done = 0
@@ -403,11 +402,10 @@ class DisplayChart:
map = {}
for individual_id in self.my_list:
individual = self.db.get_person_from_handle(individual_id)
elist = individual.get_event_list()
for event_handle in elist:
if not event_handle:
for event_ref in individual.get_event_list():
if not event_ref:
continue
event = self.db.get_event_from_handle(event_handle)
event = self.db.get_event_from_handle(event_ref.ref)
name = event.get_name()
if not name:
break

20
src/plugins/ExportVCalendar.py
View File

@@ -206,10 +206,9 @@ class CalendarWriter:
def write_family(self,family_handle):
family = self.db.get_family_from_handle(family_handle)
if family:
event_list = family.get_event_list()
for event_handle in event_list:
event = self.db.get_event_from_handle(event_handle)
if event.get_name() == "Marriage":
for event_ref in family.get_event_ref_list():
event = self.db.get_event_from_handle(event_ref.ref)
if event.get_type()[0] == RelLib.Event.MARRIAGE:
m_date = event.get_date_object()
place_handle = event.get_place_handle()
text = _("Marriage of %s") % Utils.family_name(family,self.db)
@@ -222,9 +221,9 @@ class CalendarWriter:
def write_person(self, person_handle):
person = self.db.get_person_from_handle(person_handle)
if person:
birth_handle = person.get_birth_handle()
if birth_handle:
birth = self.db.get_event_from_handle(birth_handle)
birth_ref = person.get_birth_ref()
if birth_ref:
birth = self.db.get_event_from_handle(birth_ref.ref)
if birth:
b_date = birth.get_date_object()
place_handle = birth.get_place_handle()
@@ -233,9 +232,10 @@ class CalendarWriter:
self.write_vevent(_("Birth of %s") % person.get_primary_name().get_name(), b_date, place.get_title())
else:
self.write_vevent(_("Birth of %s") % person.get_primary_name().get_name(), b_date)
death_handle = person.get_death_handle()
if death_handle:
death = self.db.get_event_from_handle(death_handle)
death_ref = person.get_death_ref()
if death_ref:
death = self.db.get_event_from_handle(death_ref.ref)
if death:
d_date = death.get_date_object()
place_handle = death.get_place_handle()

6
src/plugins/ExportVCard.py
View File

@@ -186,9 +186,9 @@ class CardWriter:
if prname.get_title():
self.writeln("TITLE:%s" % prname.get_title())
birth_handle = person.get_birth_handle()
if birth_handle:
birth = self.db.get_event_from_handle(birth_handle)
birth_ref = person.get_birth_ref()
if birth_ref:
birth = self.db.get_event_from_handle(birth_ref.ref)
if birth:
b_date = birth.get_date_object()
mod = b_date.get_modifier()

10
src/plugins/FilterEditor.py
View File

@@ -69,14 +69,14 @@ from PluginUtils import Tool, register_tool
#
#-------------------------------------------------------------------------
_name2list = {
_('Personal event:') : const.personal_events,
_('Family event:') : const.family_events,
_('Personal attribute:') : const.personal_attributes,
_('Family attribute:') : const.family_attributes,
_('Personal event:') : Utils.personal_events.values(),
_('Family event:') : Utils.family_events.values(),
_('Personal attribute:') : Utils.personal_attributes.values(),
_('Family attribute:') : Utils.family_attributes.values(),
}
_menulist = {
_('Relationship type:') : const.family_relations,
_('Relationship type:') : Utils.family_relations.values(),
}
#-------------------------------------------------------------------------

12
src/plugins/IndivSummary.py
View File

@@ -310,12 +310,12 @@ class IndivSummary(Report.Report):
self.doc.end_cell()
self.doc.end_row()
event_list = [ self.start_person.get_birth_handle(),
self.start_person.get_death_handle() ]
event_list = event_list + self.start_person.get_event_list()
for event_handle in event_list:
if event_handle:
event = self.database.get_event_from_handle(event_handle)
event_ref_list = [ self.start_person.get_birth_ref(),
self.start_person.get_death_ref() ] + \
self.start_person.get_event_list()
for event_ref in event_ref_list:
if event_ref:
event = self.database.get_event_from_handle(event_ref.ref)
self.write_fact(event)
self.doc.end_table()

6
src/plugins/NavWebPage.py
View File

@@ -1338,9 +1338,9 @@ class ContactPage(BasePage):
class IndividualPage(BasePage):
gender_map = {
RelLib.Person.MALE : const.male,
RelLib.Person.FEMALE : const.female,
RelLib.Person.UNKNOWN : const.unknown,
RelLib.Person.MALE : _('male'),
RelLib.Person.FEMALE : _('female'),
RelLib.Person.UNKNOWN : _('unknown'),
}
def __init__(self, db, person, title, ind_list, restrict_list,

4
src/plugins/WriteCD.py
View File

@@ -58,7 +58,7 @@ except:
# GRAMPS modules
#
#-------------------------------------------------------------------------
import WriteXML
import GrampsDb
import Utils
import Mime
import const
@@ -136,7 +136,7 @@ class PackageWriter:
# Write XML now
g = create('burn:///%s/data.gramps' % base,OPEN_WRITE )
gfile = WriteXML.XmlWriter(self.db,None,1)
gfile = GrampsDb.XmlWriter(self.db,None,1)
gfile.write_handle(g)
g.close()