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

Fixed some GEDCOM import with photos

Browse Source 
svn: r462
This commit is contained in:
Don Allingham 2001-10-12 05:53:54 +00:00
parent 42a0fc1ce6
commit c2d123dc48
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/ReadGedcom.py
View File

@ -54,7 +54,7 @@ def nocnv(s):
_cnv = nocnv _cnv = nocnv
photo_types = [ "jpeg", "bmp", "pict", "pntg", "tpic", "png", "gif", photo_types = [ "jpeg", "bmp", "pict", "pntg", "tpic", "png", "gif",
"tiff", "pcx" ] "jpg", "tiff", "pcx" ]
_ADDRX = [ "ADDR", "ADR1", "ADR2" ] _ADDRX = [ "ADDR", "ADR1", "ADR2" ]
@ -362,7 +362,7 @@ class GedcomParser:
elif matches[1] == "PUBL": elif matches[1] == "PUBL":
self.source.setPubInfo(matches[2] + self.parse_continue_data(2)) self.source.setPubInfo(matches[2] + self.parse_continue_data(2))
elif matches[1] == "OBJE": elif matches[1] == "OBJE":
pass self.ignore_sub_junk(2)
elif matches[1] == "NOTE": elif matches[1] == "NOTE":
if matches[2] and matches[2][0] != "@": if matches[2] and matches[2][0] != "@":
note = matches[1] + self.parse_continue_data(1) note = matches[1] + self.parse_continue_data(1)
@ -1136,10 +1136,7 @@ class GedcomParser:
source.setDate(d) source.setDate(d)
source.setText(text) source.setText(text)
elif matches[1] == "OBJE": elif matches[1] == "OBJE":
if matches[2] and matches[2][0] == '@': self.ignore_sub_junk(level+1)
self.barf(2)
else:
self.parse_source_object(source,level+1)
elif matches[1] == "QUAY": elif matches[1] == "QUAY":
val = int(matches[2]) val = int(matches[2])
if val > 1: if val > 1: