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

Bugfix for ImportProGen, bug #4869

Browse Source 
svn: r17346
This commit is contained in:
Kees Bakker 2011-04-29 21:43:45 +00:00
parent 618e5deb5b
commit 8a2dd3d050
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/import/ImportProGen.py
View File

@ -106,7 +106,11 @@ def _read_mem(bname):
<ESC> <CR> hard return <ESC> <CR> hard return
<ESC> <^Z> end of the memo field <ESC> <^Z> end of the memo field
''' '''
f = open(bname + '.mem') if os.path.exists(bname + '.MEM'):
fname = bname + '.MEM'
else:
fname = bname + '.mem'
f = open(fname)
recfmt = "i28s" recfmt = "i28s"
reclen = struct.calcsize( recfmt ) reclen = struct.calcsize( recfmt )
#print "# reclen = %d" % reclen #print "# reclen = %d" % reclen
@ -123,7 +127,11 @@ def _read_mem(bname):
def _read_recs(table, bname): def _read_recs(table, bname):
'Read records from .PER or .REL file.' 'Read records from .PER or .REL file.'
f = open(bname + table.fileext) if os.path.exists(bname + table.fileext):
fname = bname + table.fileext
else:
fname = bname + table.fileext.lower()
f = open(fname)
recfmt = table.recfmt recfmt = table.recfmt
log.info("# %s - recfmt = %s" % (table['name1'], recfmt)) log.info("# %s - recfmt = %s" % (table['name1'], recfmt))
reclen = struct.calcsize( recfmt ) reclen = struct.calcsize( recfmt )
@ -170,7 +178,7 @@ def _get_defname(fname):
# Using the directory of <fname>, go to the parent directory until # Using the directory of <fname>, go to the parent directory until
# the DEF is found. # the DEF is found.
dir_, f = os.path.split(os.path.abspath(fname)) dir_, f = os.path.split(os.path.abspath(fname))
while dir_: while dir_ and dir_ != os.sep:
newdefname = os.path.join(dir_, defname) newdefname = os.path.join(dir_, defname)
if os.path.exists(newdefname): if os.path.exists(newdefname):
@ -299,8 +307,6 @@ class PG30_Def_Table:
self.parms[m.group(1)] = m.group(2) self.parms[m.group(1)] = m.group(2)
self.fileext = self.parms.get('fileext', None) self.fileext = self.parms.get('fileext', None)
if self.fileext:
self.fileext = self.fileext.lower()
#self.name1 = self.parms.get('name1', None) #self.name1 = self.parms.get('name1', None)
# If there is a n_fields entry then this is a table that # If there is a n_fields entry then this is a table that
@ -318,7 +324,7 @@ class PG30_Def_Table:
self.nam2fld[nam] = f self.nam2fld[nam] = f
if f.size != 0: if f.size != 0:
self.nam2idx[nam] = j self.nam2idx[nam] = j
#print "# %s <= %d" % (f[0], j) #print "# %s <= %d" % (f.fieldname, j)
self.recflds.append(f) self.recflds.append(f)
j = j + 1 j = j + 1
@ -487,10 +493,9 @@ class ProgenParser(object):
self.skeys = {} # Caching source handles self.skeys = {} # Caching source handles
def parse_progen_file(self): def parse_progen_file(self):
self.progress = ProgressMeter(_("Import from Pro-Gen"), '')
self.def_ = PG30_Def(self.fname) self.def_ = PG30_Def(self.fname)
#print self.def_.diag() #print self.def_.diag()
self.progress = ProgressMeter(_("Import from Pro-Gen"), '')
self.mems = _read_mem(self.bname) self.mems = _read_mem(self.bname)
self.pers = _read_recs(self.def_['Table_1'], self.bname) self.pers = _read_recs(self.def_['Table_1'], self.bname)