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

(same as trunk r10378)

Browse Source 
#1853, #1679, #1849: Remove code that auto-generates descripion field
for events in imported gedcom. Such descriptions can always be done via
the "Extract event descriptions from event data" tool if really wanted.


svn: r10384
This commit is contained in:
James G Sack 2008-03-23 22:42:18 +00:00
parent 11406fffef
commit b95994678e
1 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/GrampsDbUtils/_GedcomParse.py
View File

@ -165,10 +165,6 @@ MIME_MAP = {
'text' : 'text/plain', 'w8bn' : 'application/msword', 'text' : 'text/plain', 'w8bn' : 'application/msword',
'wav' : 'audio/x-wav', 'mov' : 'video/quicktime', 'wav' : 'audio/x-wav', 'mov' : 'video/quicktime',
} }
EVENT_FAMILY_STR = _("%(event_name)s of %(family)s")
EVENT_PERSON_STR = _("%(event_name)s of %(person)s")
FTW_BAD_PLACE = [ FTW_BAD_PLACE = [
gen.lib.EventType.OCCUPATION, gen.lib.EventType.OCCUPATION,
@ -1497,7 +1493,6 @@ class GedcomParser(UpdateCallback):
self.__parse_level(sub_state, self.event_parse_tbl, self.__undefined) self.__parse_level(sub_state, self.event_parse_tbl, self.__undefined)
person_event_name(event, state.person)
self.dbase.commit_event(event, self.trans) self.dbase.commit_event(event, self.trans)
event_ref.ref = event.handle event_ref.ref = event.handle
state.person.add_event_ref(event_ref) state.person.add_event_ref(event_ref)
@ -1667,7 +1662,6 @@ class GedcomParser(UpdateCallback):
self.__parse_level(sub_state, self.event_parse_tbl, self.__undefined) self.__parse_level(sub_state, self.event_parse_tbl, self.__undefined)
person_event_name(event, state.person)
self.dbase.add_event(event, self.trans) self.dbase.add_event(event, self.trans)
event_ref.ref = event.handle event_ref.ref = event.handle
state.person.add_event_ref(event_ref) state.person.add_event_ref(event_ref)
@ -2488,7 +2482,6 @@ class GedcomParser(UpdateCallback):
else: else:
state.family.type.set(gen.lib.FamilyRelType.MARRIED) state.family.type.set(gen.lib.FamilyRelType.MARRIED)
family_event_name(event, state.family, self.dbase)
self.dbase.commit_event(event, self.trans) self.dbase.commit_event(event, self.trans)
event_ref.ref = event.handle event_ref.ref = event.handle
state.family.add_event_ref(event_ref) state.family.add_event_ref(event_ref)
@ -2520,8 +2513,6 @@ class GedcomParser(UpdateCallback):
self.__parse_level(sub_state, self.event_parse_tbl, self.__undefined) self.__parse_level(sub_state, self.event_parse_tbl, self.__undefined)
family_event_name(event, state.family, self.dbase)
self.dbase.commit_event(event, self.trans) self.dbase.commit_event(event, self.trans)
event_ref.ref = event.handle event_ref.ref = event.handle
state.family.add_event_ref(event_ref) state.family.add_event_ref(event_ref)
@ -4365,8 +4356,6 @@ class GedcomParser(UpdateCallback):
if description and description != 'Y': if description and description != 'Y':
event.set_description(description) event.set_description(description)
else:
person_event_name(event, state.person)
self.dbase.add_event(event, self.trans) self.dbase.add_event(event, self.trans)
sub_state = GedcomUtils.CurrentState() sub_state = GedcomUtils.CurrentState()
@ -4389,8 +4378,6 @@ class GedcomParser(UpdateCallback):
event.set_type(event_type) event.set_type(event_type)
if description and description != 'Y': if description and description != 'Y':
event.set_description(description) event.set_description(description)
else:
family_event_name(event, state.family, self.dbase)
self.dbase.add_event(event, self.trans) self.dbase.add_event(event, self.trans)
@ -4402,9 +4389,7 @@ class GedcomParser(UpdateCallback):
self.__parse_level(sub_state, event_map, self.__undefined) self.__parse_level(sub_state, event_map, self.__undefined)
family_event_name(event, state.family, self.dbase)
self.dbase.commit_event(event, self.trans) self.dbase.commit_event(event, self.trans)
event_ref.set_reference_handle(event.handle) event_ref.set_reference_handle(event.handle)
return event_ref return event_ref
@ -4438,25 +4423,4 @@ class GedcomParser(UpdateCallback):
sref.set_reference_handle(self.def_src.handle) sref.set_reference_handle(self.def_src.handle)
obj.add_source_reference(sref) obj.add_source_reference(sref)
#------------------------------------------------------------------------- #===eof===
#
# Support functions
#
#-------------------------------------------------------------------------
def person_event_name(event, person):
ename = str(event.get_type())
if not event.get_description() and ename:
text = EVENT_PERSON_STR % {
'event_name' : ename,
'person' : name_displayer.display(person),
}
event.set_description(text)
def family_event_name(event, family, dbase):
if not event.get_description() or event.get_description() == "Y":
text = EVENT_FAMILY_STR % {
'event_name' : str(event.get_type()),
'family' : Utils.family_name(family, dbase),
}
event.set_description(text)