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

Improved gedcom reading

Browse Source 
svn: r553
This commit is contained in:
Don Allingham 2001-11-05 04:33:01 +00:00
parent 31cf1dbf9d
commit 57a1c4f5b9
1 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,6 @@ import re
import string import string
import const import const
import utils import utils
import shutil
from gtk import * from gtk import *
from gnome.ui import * from gnome.ui import *
@ -56,8 +55,6 @@ _cnv = nocnv
photo_types = [ "jpeg", "bmp", "pict", "pntg", "tpic", "png", "gif", photo_types = [ "jpeg", "bmp", "pict", "pntg", "tpic", "png", "gif",
"jpg", "tiff", "pcx" ] "jpg", "tiff", "pcx" ]
_ADDRX = [ "ADDR", "ADR1", "ADR2" ]
ged2gramps = {} ged2gramps = {}
for val in const.personalConstantEvents.keys(): for val in const.personalConstantEvents.keys():
key = const.personalConstantEvents[val] key = const.personalConstantEvents[val]
@ -142,22 +139,6 @@ def importData(database, filename):
if callback: if callback:
callback(1) callback(1)
#-------------------------------------------------------------------------
#
#
#
#-------------------------------------------------------------------------
class AddrStruct:
def __init__(self):
self.label = ""
self.addr1 = ""
self.addr2 = ""
self.city = ""
self.state = ""
self.postal = ""
self.country = ""
self.phone = ""
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# #
@ -807,7 +788,7 @@ class GedcomParser:
if int(matches[0]) < level: if int(matches[0]) < level:
self.backup() self.backup()
return return
elif matches[1] in _ADDRX: elif matches[1] in [ "ADDR", "ADR1", "ADR2" ]:
val = address.getStreet() val = address.getStreet()
data = self.parse_continue_data(level+1) data = self.parse_continue_data(level+1)
if first == 0: if first == 0:
@ -845,7 +826,7 @@ class GedcomParser:
event.setName(name) event.setName(name)
elif matches[1] == "DATE": elif matches[1] == "DATE":
event.setDate(matches[2]) event.setDate(matches[2])
elif matches[1] == ["TIME","ADDR","AGE","AGNC","STAT","TEMP","OBJE","QUAY"]: elif matches[1] == ["TIME","ADDR","AGE","AGNC","STAT","TEMP","OBJE"]:
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
elif matches[1] == "SOUR": elif matches[1] == "SOUR":
source_ref = SourceRef() source_ref = SourceRef()
@ -918,7 +899,7 @@ class GedcomParser:
event.setName(matches[2]) event.setName(matches[2])
elif matches[1] == "DATE": elif matches[1] == "DATE":
event.setDate(matches[2]) event.setDate(matches[2])
elif matches[1] == ["TIME","AGE","AGNC","CAUS","ADDR","STAT","TEMP","HUSB","WIFE","OBJE","QUAY"]: elif matches[1] == ["TIME","AGE","AGNC","CAUS","ADDR","STAT","TEMP","HUSB","WIFE","OBJE"]:
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
elif matches[1] == "SOUR": elif matches[1] == "SOUR":
source_ref = SourceRef() source_ref = SourceRef()
@ -1195,15 +1176,9 @@ class GedcomParser:
return return
def ignore_change_data(self,level): def ignore_change_data(self,level):
matches = self.get_next() matches = self.get_next()
if matches[1] == "CHAN": if matches[1] == "CHAN":
while 1: self.ignore_sub_junk(level+1)
matches = self.get_next()
if int(matches[0]) < level+1:
self.backup()
return
else: else:
self.backup() self.backup()
@ -1279,8 +1254,7 @@ def readData(database,active_person,cb):
db = database db = database
callback = cb callback = cb
base = os.path.dirname(__file__) glade_file = "%s/gedcomimport.glade" % os.path.dirname(__file__)
glade_file = base + os.sep + "gedcomimport.glade"
dic = { dic = {
"destroy_passed_object" : utils.destroy_passed_object, "destroy_passed_object" : utils.destroy_passed_object,