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

update for GEDCOM memory usage

Browse Source 
svn: r3123
This commit is contained in:
Don Allingham 2004-05-04 04:34:48 +00:00
parent 75346c6a29
commit d327a58277
2 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/PeopleModel.py
View File

@ -251,9 +251,13 @@ class PeopleModel(gtk.GenericTreeModel):
self.top_visible = {} self.top_visible = {}
def set_visible(self,iter,val): def set_visible(self,iter,val):
col = self.iter2path[iter] try:
self.top_visible[col[0]] = val col = self.iter2path[iter]
self.visible[iter] = val self.top_visible[col[0]] = val
self.visible[iter] = val
except:
print iter,val
self.visible[iter] = val
def on_iter_next(self, node): def on_iter_next(self, node):
'''returns the next node at this level of the tree''' '''returns the next node at this level of the tree'''

102
src/plugins/ReadGedcom.py
View File

@ -231,7 +231,6 @@ class GedcomParser:
self.trans = string.maketrans('','') self.trans = string.maketrans('','')
self.delc = self.trans[0:31] self.delc = self.trans[0:31]
self.trans2 = self.trans[0:128] + ('?' * 128) self.trans2 = self.trans[0:128] + ('?' * 128)
self.window = window self.window = window
@ -264,7 +263,7 @@ class GedcomParser:
mypaths = [] mypaths = []
f = open("/proc/mounts","r") f = open("/proc/mounts","r")
for line in f.readlines(): for line in f.xreadlines():
paths = string.split(line) paths = string.split(line)
ftype = paths[2].upper() ftype = paths[2].upper()
if ftype in file_systems.keys(): if ftype in file_systems.keys():
@ -330,7 +329,7 @@ class GedcomParser:
def update(self,field,text): def update(self,field,text):
field.set_text(text) field.set_text(text)
while gtk.events_pending(): while gtk.events_pending():
gtk.mainiteration() gtk.main_iteration()
def get_next(self): def get_next(self):
if self.backoff == 0: if self.backoff == 0:
@ -492,12 +491,16 @@ class GedcomParser:
father = self.family.get_father_id() father = self.family.get_father_id()
if father: if father:
father.add_address(self.addr) father.add_address(self.addr)
self.db.commit_person(father)
mother = self.family.get_mother_id() mother = self.family.get_mother_id()
if mother: if mother:
mother.add_address(self.addr) mother.add_address(self.addr)
self.db.commit_person(mother)
for child in self.family.get_child_id_list(): for child in self.family.get_child_id_list():
child.add_address(self.addr) child.add_address(self.addr)
self.db.commit_person(child)
self.db.commit_family(self.family) self.db.commit_family(self.family)
del self.family
elif matches[2] == "INDI": elif matches[2] == "INDI":
if self.indi_count % UPDATE == 0 and self.window: if self.indi_count % UPDATE == 0 and self.window:
self.update(self.people_obj,str(self.indi_count)) self.update(self.people_obj,str(self.indi_count))
@ -505,9 +508,10 @@ class GedcomParser:
id = matches[1] id = matches[1]
id = id[1:-1] id = id[1:-1]
self.person = self.find_or_create_person(id) self.person = self.find_or_create_person(id)
self.added[self.person.get_id()] = self.person self.added[self.person.get_id()] = 1
self.parse_individual() self.parse_individual()
self.db.commit_person(self.person) self.db.commit_person(self.person)
del self.person
elif matches[2] in ["SUBM","SUBN","REPO"]: elif matches[2] in ["SUBM","SUBN","REPO"]:
self.ignore_sub_junk(1) self.ignore_sub_junk(1)
elif matches[1] in ["SUBM","SUBN","OBJE","_EVENT_DEFN"]: elif matches[1] in ["SUBM","SUBN","OBJE","_EVENT_DEFN"]:
@ -670,6 +674,7 @@ class GedcomParser:
self.family.add_event_id(event.get_id()) self.family.add_event_id(event.get_id())
self.parse_family_event(event,2) self.parse_family_event(event,2)
self.db.commit_event(event) self.db.commit_event(event)
del event
def parse_note_base(self,matches,obj,level,old_note,task): def parse_note_base(self,matches,obj,level,old_note,task):
note = old_note note = old_note
@ -1704,23 +1709,25 @@ class GedcomParser:
prefix = self.db.iprefix prefix = self.db.iprefix
index = 0 index = 0
new_pmax = self.db.pmap_index new_pmax = self.db.pmap_index
for pid, person in self.added.items(): for pid in self.added.keys():
index = index + 1 index = index + 1
if self.refn.has_key(pid): if self.refn.has_key(pid):
val = self.refn[pid] val = self.refn[pid]
new_key = prefix % val new_key = prefix % val
new_pmax = max(new_pmax,val) new_pmax = max(new_pmax,val)
person = self.db.find_person_from_id(pid)
# new ID is not used # new ID is not used
if not self.db.has_person_id(new_key): if not self.db.has_person_id(new_key):
self.db.remove_person_id(person.get_id()) self.db.remove_person_id(pid)
person.set_id(new_key) person.set_id(new_key)
self.db.add_person_as(person) self.db.add_person(person)
else: else:
tp = self.db.find_person_from_id(new_key) tp = self.db.find_person_from_id(new_key)
# same person, just change it # same person, just change it
if person == tp: if person == tp:
self.db.remove_person_id(person.get_id()) self.db.remove_person_id(pid)
person.set_id(new_key) person.set_id(new_key)
self.db.add_person_as(person) self.db.add_person_as(person)
# give up trying to use the refn as a key # give up trying to use the refn as a key
@ -1729,8 +1736,11 @@ class GedcomParser:
self.db.pmap_index = new_pmax self.db.pmap_index = new_pmax
global file_top #-------------------------------------------------------------------------
#
#
#
#-------------------------------------------------------------------------
def readData(database,active_person,cb): def readData(database,active_person,cb):
global db global db
global callback global callback
@ -1738,51 +1748,39 @@ def readData(database,active_person,cb):
db = database db = database
callback = cb callback = cb
file_top = gtk.FileSelection("%s - GRAMPS" % _title_string) choose = gtk.FileChooserDialog("%s - GRAMPS" % _title_string,
file_top.hide_fileop_buttons() None,
file_top.ok_button.connect('clicked', on_ok_clicked) gtk.FILE_CHOOSER_ACTION_OPEN,
file_top.cancel_button.connect('clicked', on_cancel_clicked) (gtk.STOCK_CANCEL,
file_top.show() gtk.RESPONSE_CANCEL,
gtk.STOCK_OPEN,
gtk.RESPONSE_OK))
filter = gtk.FileFilter()
filter.set_name(_('GEDCOM files'))
filter.add_pattern('*.ged')
filter.add_pattern('*.GED')
choose.add_filter(filter)
filter = gtk.FileFilter()
filter.set_name(_('All files'))
filter.add_pattern('*')
choose.add_filter(filter)
response = choose.run()
choose.destroy()
if response == gtk.RESPONSE_OK:
filename = choose.get_filename()
try:
importData(db,filename)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# #
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
def on_ok_clicked(obj): from Plugins import register_import
register_import(readData,_title_string)
name = file_top.get_filename()
if name == "":
return
Utils.destroy_passed_object(file_top)
try:
importData(db,name)
except:
import DisplayTrace
DisplayTrace.DisplayTrace()
def on_cancel_clicked(obj):
file_top.destroy()
#-------------------------------------------------------------------------
#
#
#
#-------------------------------------------------------------------------
if __name__ == "__main__":
import sys
import GrampsXML
import profile
print "Reading %s" % sys.argv[1]
db = GrampsXML.GrampsXML()
g = GedcomParser(db,sys.argv[1],None)
profile.run('g.parse_gedcom_file()')
g.resolve_refns()
else:
from Plugins import register_import
register_import(readData,_title_string)