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

2006-08-15 Don Allingham <don@gramps-project.org>

Browse Source 
* src/GrampsDb/_ReadGedcom.py: support for AGE, CAUSE, and AGENCY
	* src/GrampsDb/_GedTokens.py: support for AGE and AGENCY



svn: r7184
This commit is contained in:
Don Allingham 2006-08-16 00:30:37 +00:00
parent 70f597f9b2
commit 207c6f6690
4 changed files with 95 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2006-08-15 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcom.py: support for AGE, CAUSE, and AGENCY
* src/GrampsDb/_GedTokens.py: support for AGE and AGENCY
2006-08-15 Alex Roitman <shura@gramps-project.org> 2006-08-15 Alex Roitman <shura@gramps-project.org>
* src/GrampsDb/_ReadXML.py (start_attribute): Support attributes * src/GrampsDb/_ReadXML.py (start_attribute): Support attributes
in event and eventref; in event and eventref;

7
gramps2/example/gedcom/sample.ged
View File

@ -126,6 +126,9 @@
1 DEAT 1 DEAT
2 DATE deceased 2 DATE deceased
2 PLAC Sweden 2 PLAC Sweden
2 AGNC Some type of agency
2 AGE 94y
2 CAUS Killer tomatoes
1 ADOP 1 ADOP
2 FAMC @F04@ 2 FAMC @F04@
3 ADOP @I38@ 3 ADOP @I38@
@ -692,6 +695,10 @@
2 _FREL Natural 2 _FREL Natural
2 _MREL Natural 2 _MREL Natural
1 MARR 1 MARR
2 HUSB
3 AGE 30y
2 WIFE
3 AGE 330y
2 DATE 12 JUL 1986 2 DATE 12 JUL 1986
2 PLAC Woodland, Yolo Co., CA 2 PLAC Woodland, Yolo Co., CA
0 @F15@ FAM 0 @F15@ FAM

4
gramps2/src/GrampsDb/_GedTokens.py
View File

@ -128,6 +128,8 @@ TOKEN_RELA = 108
TOKEN__LKD = 109 TOKEN__LKD = 109
TOKEN_BLOB = 110 TOKEN_BLOB = 110
TOKEN_CONL = 111 TOKEN_CONL = 111
TOKEN_AGE = 112
TOKEN_AGNC = 113
tokens = { tokens = {
"HEAD" : TOKEN_HEAD, "MEDI" : TOKEN_MEDI, "HEAD" : TOKEN_HEAD, "MEDI" : TOKEN_MEDI,
@ -137,7 +139,7 @@ tokens = {
"ADOPT" : TOKEN_ADOP, "ADR1" : TOKEN_ADR1, "ADOPT" : TOKEN_ADOP, "ADR1" : TOKEN_ADR1,
"ADDRESS1" : TOKEN_ADR1, "ADR2" : TOKEN_ADR2, "ADDRESS1" : TOKEN_ADR1, "ADR2" : TOKEN_ADR2,
"ADDRESS2" : TOKEN_ADR2, "AFN" : TOKEN_AFN, "ADDRESS2" : TOKEN_ADR2, "AFN" : TOKEN_AFN,
"AGE" : TOKEN_IGNORE, "AGNC" : TOKEN_IGNORE, "AGE" : TOKEN_AGE, "AGNC" : TOKEN_AGNC,
"AGENCY" : TOKEN_IGNORE, "_AKA" : TOKEN__AKA, "AGENCY" : TOKEN_IGNORE, "_AKA" : TOKEN__AKA,
"_ALIA" : TOKEN_ALIA, "ALIA" : TOKEN_ALIA, "_ALIA" : TOKEN_ALIA, "ALIA" : TOKEN_ALIA,
"ALIAS" : TOKEN_ALIA, "ANCI" : TOKEN_ANCI, "ALIAS" : TOKEN_ALIA, "ANCI" : TOKEN_ANCI,

112
gramps2/src/GrampsDb/_ReadGedcom.py
View File

@ -554,6 +554,8 @@ class GedcomParser(UpdateCallback):
TOKEN_PLAC : self.func_event_place, TOKEN_PLAC : self.func_event_place,
TOKEN_ADDR : self.func_event_addr, TOKEN_ADDR : self.func_event_addr,
TOKEN_CAUS : self.func_event_cause, TOKEN_CAUS : self.func_event_cause,
TOKEN_AGNC : self.func_event_agnc,
TOKEN_AGE : self.func_event_age,
TOKEN_NOTE : self.func_event_note, TOKEN_NOTE : self.func_event_note,
TOKEN_OFFI : self.func_event_note, TOKEN_OFFI : self.func_event_note,
TOKEN_PHON : self.func_event_ignore, TOKEN_PHON : self.func_event_ignore,
@ -566,8 +568,8 @@ class GedcomParser(UpdateCallback):
TOKEN_IGNORE : self.func_event_ignore, TOKEN_IGNORE : self.func_event_ignore,
TOKEN_STAT : self.func_event_ignore, TOKEN_STAT : self.func_event_ignore,
TOKEN_TEMP : self.func_event_ignore, TOKEN_TEMP : self.func_event_ignore,
TOKEN_HUSB : self.func_event_ignore, TOKEN_HUSB : self.func_event_husb,
TOKEN_WIFE : self.func_event_ignore, TOKEN_WIFE : self.func_event_wife,
TOKEN_OBJE : self.func_event_object, TOKEN_OBJE : self.func_event_object,
TOKEN_FAMC : self.func_person_birth_famc, TOKEN_FAMC : self.func_person_birth_famc,
} }
@ -580,6 +582,8 @@ class GedcomParser(UpdateCallback):
TOKEN_PLAC : self.func_event_place, TOKEN_PLAC : self.func_event_place,
TOKEN_ADDR : self.func_event_addr, TOKEN_ADDR : self.func_event_addr,
TOKEN_CAUS : self.func_event_cause, TOKEN_CAUS : self.func_event_cause,
TOKEN_AGNC : self.func_event_agnc,
TOKEN_AGE : self.func_event_age,
TOKEN_NOTE : self.func_event_note, TOKEN_NOTE : self.func_event_note,
TOKEN_OFFI : self.func_event_note, TOKEN_OFFI : self.func_event_note,
TOKEN__GODP : self.func_event_ignore, TOKEN__GODP : self.func_event_ignore,
@ -942,6 +946,12 @@ class GedcomParser(UpdateCallback):
def func_source_abbr(self, matches, source, level): def func_source_abbr(self, matches, source, level):
source.set_abbreviation(matches[2]) source.set_abbreviation(matches[2])
def func_source_agnc(self, matches, source, level):
a = RelLib.Attribute()
a.set_type(RelLib.AttributeType.AGENCY)
a.set_value(matches[2])
source.add_attribute(a)
def func_source_text(self, matches, source, level): def func_source_text(self, matches, source, level):
note = source.get_note() note = source.get_note()
source.set_note(note.strip()) source.set_note(note.strip())
@ -1374,7 +1384,7 @@ class GedcomParser(UpdateCallback):
(form, filename, title, note) = self.parse_obje(level) (form, filename, title, note) = self.parse_obje(level)
self.build_media_object(self.family, form, filename, title, note) self.build_media_object(self.family, form, filename, title, note)
def func_event_object(self, matches, event, level): def func_event_object(self, matches, event_ref, event, level):
if matches[2] and matches[2][0] == '@': if matches[2] and matches[2][0] == '@':
self.not_recognized(level) self.not_recognized(level)
else: else:
@ -1446,7 +1456,9 @@ class GedcomParser(UpdateCallback):
matches[2] != 'Y': matches[2] != 'Y':
event.set_description(matches[2]) event.set_description(matches[2])
self.parse_event(event, self.generic_event_map, 2) event_ref = RelLib.EventRef()
self.parse_event(event_ref, event, self.generic_event_map, 2)
if int(event.get_type()) == RelLib.EventType.MARRIAGE: if int(event.get_type()) == RelLib.EventType.MARRIAGE:
@ -1470,7 +1482,6 @@ class GedcomParser(UpdateCallback):
self.db.add_event(event,self.trans) self.db.add_event(event,self.trans)
event_ref = RelLib.EventRef()
event_ref.set_reference_handle(event.handle) event_ref.set_reference_handle(event.handle)
event_ref.set_role(RelLib.EventRoleType.FAMILY) event_ref.set_role(RelLib.EventRoleType.FAMILY)
self.family.add_event_ref(event_ref) self.family.add_event_ref(event_ref)
@ -1786,22 +1797,22 @@ class GedcomParser(UpdateCallback):
else: else:
self.not_recognized(level+1) self.not_recognized(level+1)
def parse_event(self, event, func_map, level): def parse_event(self, event_ref, event, func_map, level):
while True: while True:
matches = self.get_next() matches = self.get_next()
if self.level_is_finished(matches,level): if self.level_is_finished(matches,level):
break break
else: else:
func = func_map.get(matches[1], self.func_event_undef) func = func_map.get(matches[1], self.func_event_undef)
func(matches, event, level+1) func(matches, event_ref, event, level+1)
def func_event_ignore(self, matches, event, level): def func_event_ignore(self, matches, event_ref, event, level):
self.ignore_sub_junk(level) self.ignore_sub_junk(level)
def func_event_undef(self, matches, event, level): def func_event_undef(self, matches, event_ref, event, level):
self.not_recognized(level) self.not_recognized(level)
def func_event_type(self, matches, event, level): def func_event_type(self, matches, event_ref, event, level):
if event.get_type().is_custom(): if event.get_type().is_custom():
if ged2gramps.has_key(matches[2]): if ged2gramps.has_key(matches[2]):
name = RelLib.EventType(ged2gramps[matches[2]]) name = RelLib.EventType(ged2gramps[matches[2]])
@ -1821,10 +1832,10 @@ class GedcomParser(UpdateCallback):
except IndexError: except IndexError:
pass pass
def func_event_privacy(self, matches, event, level): def func_event_privacy(self, matches, event_ref, event, level):
event.set_privacy(True) event.set_privacy(True)
def func_person_adopt_famc(self, matches, event, level): def func_person_adopt_famc(self, matches, event_ref, event, level):
handle = self.find_family_handle(matches[2][1:-1]) handle = self.find_family_handle(matches[2][1:-1])
mrel,frel = self.parse_adopt_famc(level); mrel,frel = self.parse_adopt_famc(level);
@ -1847,7 +1858,7 @@ class GedcomParser(UpdateCallback):
family.add_child_ref(ref) family.add_child_ref(ref)
self.db.commit_family(family, self.trans) self.db.commit_family(family, self.trans)
def func_person_birth_famc(self, matches, event, level): def func_person_birth_famc(self, matches, event_ref, event, level):
handle = self.find_family_handle(matches[2][1:-1]) handle = self.find_family_handle(matches[2][1:-1])
if self.person.get_main_parents_family_handle() == handle: if self.person.get_main_parents_family_handle() == handle:
@ -1871,16 +1882,16 @@ class GedcomParser(UpdateCallback):
family.add_child_ref(ref) family.add_child_ref(ref)
self.db.commit_family(family, self.trans) self.db.commit_family(family, self.trans)
def func_event_note(self, matches, event, level): def func_event_note(self, matches, event_ref, event, level):
self.parse_note(matches,event,level+1,'') self.parse_note(matches,event,level+1,'')
def func_event_date(self, matches, event, level): def func_event_date(self, matches, event_ref, event, level):
event.set_date_object(self.extract_date(matches[2])) event.set_date_object(self.extract_date(matches[2]))
def func_event_source(self, matches, event, level): def func_event_source(self, matches, event_ref, event, level):
event.add_source_reference(self.handle_source(matches,level)) event.add_source_reference(self.handle_source(matches,level))
def func_event_addr(self, matches, event, level): def func_event_addr(self, matches, event_ref, event, level):
place = self.find_or_create_place(matches[2]) place = self.find_or_create_place(matches[2])
place_handle = place.handle place_handle = place.handle
place.set_title(matches[2]) place.set_title(matches[2])
@ -1891,7 +1902,7 @@ class GedcomParser(UpdateCallback):
event.set_place_handle(place_handle) event.set_place_handle(place_handle)
self.db.commit_place(place, self.trans) self.db.commit_place(place, self.trans)
def func_event_place(self, matches, event, level): def func_event_place(self, matches, event_ref, event, level):
""" """
n PLAC <PLACE_VALUE> {1:1} n PLAC <PLACE_VALUE> {1:1}
+1 FORM <PLACE_HIERARCHY> {0:1} +1 FORM <PLACE_HIERARCHY> {0:1}
@ -1923,9 +1934,46 @@ class GedcomParser(UpdateCallback):
self.db.commit_place(place, self.trans) self.db.commit_place(place, self.trans)
def func_event_cause(self, matches, event, level): def func_event_cause(self, matches, event_ref, event, level):
event.set_cause(matches[2]) a = RelLib.Attribute()
self.parse_cause(event,level+1) a.set_type(RelLib.AttributeType.CAUSE)
a.set_value(matches[2])
event.add_attribute(a)
self.parse_cause(a,level+1)
def func_event_age(self, matches, event_ref, event, level):
a = RelLib.Attribute()
a.set_type(RelLib.AttributeType.AGE)
a.set_value(matches[2])
event_ref.add_attribute(a)
def func_event_husb(self, matches, event_ref, event, level):
while True:
matches = self.get_next()
if self.level_is_finished(matches, level):
break
elif matches[1] == TOKEN_AGE:
a = RelLib.Attribute()
a.set_type(RelLib.AttributeType.FATHER_AGE)
a.set_value(matches[2])
event_ref.add_attribute(a)
def func_event_wife(self, matches, event_ref, event, level):
while True:
matches = self.get_next()
if self.level_is_finished(matches, level):
break
elif matches[1] == TOKEN_AGE:
a = RelLib.Attribute()
a.set_type(RelLib.AttributeType.MOTHER_AGE)
a.set_value(matches[2])
event_ref.add_attribute(a)
def func_event_agnc(self, matches, event_ref, event, level):
a = RelLib.Attribute()
a.set_type(RelLib.AttributeType.AGENCY)
a.set_value(matches[2])
event.add_attribute(a)
def parse_adopt_famc(self,level): def parse_adopt_famc(self,level):
mrel = _TYPE_BIRTH mrel = _TYPE_BIRTH
@ -2778,14 +2826,14 @@ class GedcomParser(UpdateCallback):
is beyond me. is beyond me.
""" """
event = RelLib.Event() event = RelLib.Event()
event_ref = RelLib.EventRef()
event.set_gramps_id(self.emapper.find_next()) event.set_gramps_id(self.emapper.find_next())
event.set_type(RelLib.EventType.BIRTH) event.set_type(RelLib.EventType.BIRTH)
self.parse_event(event, self.generic_event_map, 2) self.parse_event(event_ref, event, self.generic_event_map, 2)
person_event_name(event,state.person) person_event_name(event,state.person)
self.db.add_event(event, self.trans) self.db.add_event(event, self.trans)
event_ref = RelLib.EventRef()
event_ref.set_reference_handle(event.handle) event_ref.set_reference_handle(event.handle)
if state.person.get_birth_ref(): if state.person.get_birth_ref():
@ -2803,11 +2851,12 @@ class GedcomParser(UpdateCallback):
event = RelLib.Event() event = RelLib.Event()
event.set_gramps_id(self.emapper.find_next()) event.set_gramps_id(self.emapper.find_next())
event.set_type(RelLib.EventType.ADOPT) event.set_type(RelLib.EventType.ADOPT)
self.parse_event(event, self.person_adopt_map, 2) event_ref = RelLib.EventRef()
self.parse_event(event_ref, event, self.person_adopt_map, 2)
person_event_name(event,state.person) person_event_name(event,state.person)
self.db.add_event(event, self.trans) self.db.add_event(event, self.trans)
event_ref = RelLib.EventRef()
event_ref.set_reference_handle(event.handle) event_ref.set_reference_handle(event.handle)
state.person.add_event_ref(event_ref) state.person.add_event_ref(event_ref)
@ -2817,16 +2866,16 @@ class GedcomParser(UpdateCallback):
+1 <<EVENT_DETAIL>> {0:1} p.* +1 <<EVENT_DETAIL>> {0:1} p.*
""" """
event = RelLib.Event() event = RelLib.Event()
event_ref = RelLib.EventRef()
event.set_gramps_id(self.emapper.find_next()) event.set_gramps_id(self.emapper.find_next())
if matches[2] and matches[2] != 'Y': if matches[2] and matches[2] != 'Y':
event.set_description(matches[2]) event.set_description(matches[2])
event.type.set(RelLib.EventType.DEATH) event.type.set(RelLib.EventType.DEATH)
self.parse_event(event, self.generic_event_map, 2) self.parse_event(event_ref, event, self.generic_event_map, 2)
person_event_name(event,state.person) person_event_name(event,state.person)
self.db.add_event(event, self.trans) self.db.add_event(event, self.trans)
event_ref = RelLib.EventRef()
event_ref.set_reference_handle(event.handle) event_ref.set_reference_handle(event.handle)
if state.person.get_death_ref(): if state.person.get_death_ref():
@ -2840,11 +2889,13 @@ class GedcomParser(UpdateCallback):
+1 <<EVENT_DETAIL>> {0:1} p.* +1 <<EVENT_DETAIL>> {0:1} p.*
""" """
event = RelLib.Event() event = RelLib.Event()
event_ref = RelLib.EventRef()
event.set_type((RelLib.EventType.CUSTOM,"")) event.set_type((RelLib.EventType.CUSTOM,""))
event.set_gramps_id(self.emapper.find_next()) event.set_gramps_id(self.emapper.find_next())
if matches[2] and matches[2] != 'Y': if matches[2] and matches[2] != 'Y':
event.set_description(matches[2]) event.set_description(matches[2])
self.parse_event(event, self.generic_event_map, 2) self.parse_event(event_ref, event, self.generic_event_map, 2)
the_type = event.get_type() the_type = event.get_type()
if int(the_type) == RelLib.EventType.CUSTOM \ if int(the_type) == RelLib.EventType.CUSTOM \
@ -2855,7 +2906,6 @@ class GedcomParser(UpdateCallback):
state.person.add_attribute(attr) state.person.add_attribute(attr)
else: else:
self.db.add_event(event, self.trans) self.db.add_event(event, self.trans)
event_ref = RelLib.EventRef()
event_ref.set_reference_handle(event.handle) event_ref.set_reference_handle(event.handle)
state.person.add_event_ref(event_ref) state.person.add_event_ref(event_ref)
@ -2904,14 +2954,14 @@ class GedcomParser(UpdateCallback):
else: else:
event.set_type((RelLib.EventType.CUSTOM,n)) event.set_type((RelLib.EventType.CUSTOM,n))
self.parse_event(event, self.generic_event_map, 2) event_ref = RelLib.EventRef()
self.parse_event(event_ref, event, self.generic_event_map, 2)
if matches[2] and matches[2] != 'Y': if matches[2] and matches[2] != 'Y':
event.set_description(matches[2]) event.set_description(matches[2])
person_event_name(event,state.person) person_event_name(event,state.person)
self.db.add_event(event, self.trans) self.db.add_event(event, self.trans)
event_ref = RelLib.EventRef()
event_ref.set_reference_handle(event.handle) event_ref.set_reference_handle(event.handle)
state.person.add_event_ref(event_ref) state.person.add_event_ref(event_ref)