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

* src/GrampsDb/_GrampsBSDDB.py (_find_by_handle): delegate key

Browse Source 
lookup to dbmap.db; (transaction_commit, transaction_begin):
Enable removing/rebuilding of the secondary index.
* src/GrampsDb/_ReadXML.py (LineParser): Improve first pass.


svn: r5861
This commit is contained in:
Alex Roitman
2006-02-01 06:25:51 +00:00
parent 04de8dc8d4
commit 265ea23bc4
3 changed files with 56 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/GrampsDb/_ReadXML.py
View File

@ -84,11 +84,8 @@ def importData(database, filename, callback=None,cl=0,use_trans=False):
change = os.path.getmtime(filename)
parser = GrampsParser(database,callback,basefile,change,filename)
print "starting line parser"
linecounter = LineParser(filename)
print "finished parser"
lc = linecounter.get_count()
print "got line count:", lc
ro = database.readonly
database.readonly = False
@ -231,7 +228,9 @@ class LineParser:
else:
f = open(filename,"r")
self.count = len(f.readlines())
for line in f:
self.count += 1
f.close()
except:
self.count = 0
@ -587,12 +586,12 @@ class GrampsParser:
self.db.set_researcher(self.owner)
if self.home != None:
person = self.db.find_person_from_handle(self.home,self.trans)
self.db.set_default_person_handle(person.get_handle())
self.db.set_default_person_handle(person.handle)
if self.tempDefault != None:
handle = self.map_gid(self.tempDefault)
person = self.find_person_by_gramps_id(handle)
gramps_id = self.map_gid(self.tempDefault)
person = self.find_person_by_gramps_id(gramps_id)
if person:
self.db.set_default_person_handle(person.get_handle())
self.db.set_default_person_handle(person.handle)
for key in self.func_map.keys():
del self.func_map[key]
@ -1649,11 +1648,8 @@ if __name__ == "__main__":
parser = GrampsParser(database,callback,basefile,change,filename)
print "starting line parser"
linecounter = LineParser(filename)
print "finished parser"
lc = linecounter.get_count()
print "got line count:", lc
xml_file = gzip.open(filename,"rb")