Fixed dropping of some fields for an individual
svn: r81
This commit is contained in:
parent
f08f347839
commit
560713e6c1
@ -483,6 +483,7 @@ class GedcomParser:
|
|||||||
while 1:
|
while 1:
|
||||||
matches = self.get_next()
|
matches = self.get_next()
|
||||||
|
|
||||||
|
print matches[0],matches[1],matches[2]
|
||||||
if int(matches[0]) == 0:
|
if int(matches[0]) == 0:
|
||||||
self.backup()
|
self.backup()
|
||||||
return
|
return
|
||||||
@ -504,19 +505,18 @@ class GedcomParser:
|
|||||||
elif matches[1] == "AFN":
|
elif matches[1] == "AFN":
|
||||||
pass
|
pass
|
||||||
elif matches[1] == "CHAN":
|
elif matches[1] == "CHAN":
|
||||||
self.ignore_sub_junk(1)
|
self.ignore_sub_junk(2)
|
||||||
elif matches[1] == "ALIA":
|
elif matches[1] == "ALIA":
|
||||||
pass
|
pass
|
||||||
elif matches[1] == "ANCI" or matches[1] == "DESI":
|
elif matches[1] == "ANCI" or matches[1] == "DESI":
|
||||||
pass
|
pass
|
||||||
elif matches[1] == "REFN":
|
elif matches[1] == "REFN":
|
||||||
self.ignore_sub_junk(1)
|
self.ignore_sub_junk(2)
|
||||||
elif matches[1] == "SOUR":
|
elif matches[1] == "SOUR":
|
||||||
self.ignore_sub_junk(1)
|
self.ignore_sub_junk(2)
|
||||||
elif matches[1] == "OBJE":
|
elif matches[1] == "OBJE":
|
||||||
if matches[2] and matches[2][0] == '@':
|
if matches[2] and matches[2][0] == '@':
|
||||||
self.barf(2)
|
self.barf(2)
|
||||||
# self.ignore_sub_junk(2)
|
|
||||||
else:
|
else:
|
||||||
self.parse_person_object(2)
|
self.parse_person_object(2)
|
||||||
elif matches[1] == "NOTE":
|
elif matches[1] == "NOTE":
|
||||||
@ -539,7 +539,9 @@ class GedcomParser:
|
|||||||
elif matches[1] == "EVEN":
|
elif matches[1] == "EVEN":
|
||||||
pass
|
pass
|
||||||
elif matches[1] == "FAMS":
|
elif matches[1] == "FAMS":
|
||||||
self.person.addFamily(self.db.findFamily(matches[2],self.fmap))
|
family = self.db.findFamily(matches[2],self.fmap)
|
||||||
|
print self.person.getPrimaryName().getName(),matches[2]
|
||||||
|
self.person.addFamily(family)
|
||||||
note = self.parse_optional_note(2)
|
note = self.parse_optional_note(2)
|
||||||
elif matches[1] == "FAMC":
|
elif matches[1] == "FAMC":
|
||||||
type,note = self.parse_famc_type(2)
|
type,note = self.parse_famc_type(2)
|
||||||
|
Loading…
Reference in New Issue
Block a user