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

Fixed the "in" to "==" problem

Browse Source 
svn: r141
This commit is contained in:
Don Allingham 2001-06-15 04:00:26 +00:00
parent ab9892b87b
commit 3a4f4f6dc7
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gramps/src/plugins/ReadGedcom.py
View File

@ -764,9 +764,9 @@ class GedcomParser:
break break
elif matches[1] == "DATE": elif matches[1] == "DATE":
address.setDate(matches[2]) address.setDate(matches[2])
elif matches[1] == "AGE" or matches[1] in "AGNC": elif matches[1] == "AGE" or matches[1] == "AGNC":
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
elif matches[1] == "CAUS" or matches[1] in "ADDR": elif matches[1] == "CAUS" or matches[1] == "ADDR":
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
elif matches[1] == "STAT" or matches[1] == "TEMP": elif matches[1] == "STAT" or matches[1] == "TEMP":
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
@ -847,11 +847,7 @@ class GedcomParser:
name = ged2rel[matches[2]] name = ged2rel[matches[2]]
else: else:
name = matches[2] name = matches[2]
print name
event.setName(name) event.setName(name)
else:
print "*",event.getName()
print event.getName()
elif matches[1] == "DATE": elif matches[1] == "DATE":
event.setDate(matches[2]) event.setDate(matches[2])
elif matches[1] == "AGE" or matches[1] == "AGNC": elif matches[1] == "AGE" or matches[1] == "AGNC":
@ -906,7 +902,7 @@ class GedcomParser:
event.setDate(matches[2]) event.setDate(matches[2])
elif matches[1] == "AGE" or matches[1] == "AGNC": elif matches[1] == "AGE" or matches[1] == "AGNC":
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
elif matches[1] == "CAUS" or matches[1] in "ADDR": elif matches[1] == "CAUS" or matches[1] == "ADDR":
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
elif matches[1] == "STAT" or matches[1] == "TEMP": elif matches[1] == "STAT" or matches[1] == "TEMP":
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
@ -1262,7 +1258,7 @@ class GedcomParser:
if int(matches[0]) < level: if int(matches[0]) < level:
self.backup() self.backup()
return return
elif matches[1] in "ADDR": elif matches[1] == "ADDR":
addr.label = matches[2] addr.label = matches[2]
self.parse_sub_addr(level+1, addr) self.parse_sub_addr(level+1, addr)
elif matches[1] == "PHON": elif matches[1] == "PHON":