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

* src/GrampsCfg.py: change the default prefixes so that they

Browse Source 
sort nicely numerically.
* src/plugins/ReadGedcom.py: handle eazytree oddities.


svn: r2528
This commit is contained in:
Don Allingham 2003-12-16 04:04:08 +00:00
parent 2df97ee52c
commit a788aa3ce1
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gramps2/src/GrampsCfg.py
View File

@ -128,11 +128,11 @@ panellist = [
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
iprefix = "I" iprefix = "I%04d"
oprefix = "O" oprefix = "O%04d"
sprefix = "S" sprefix = "S%04d"
pprefix = "P" pprefix = "P%04d"
fprefix = "F" fprefix = "F%04d"
autoload = 0 autoload = 0
autosave_int = 0 autosave_int = 0
uselds = 0 uselds = 0

13
gramps2/src/plugins/ReadGedcom.py
View File

@ -337,9 +337,6 @@ class GedcomParser:
next_line = self.f.readline() next_line = self.f.readline()
self.text = string.translate(next_line.strip(),self.trans,self.delc) self.text = string.translate(next_line.strip(),self.trans,self.delc)
if not self.text:
raise Errors.GedcomError(_("GEDCOM file ended unexpectedly"))
try: try:
self.text = self.cnv(self.text) self.text = self.cnv(self.text)
except: except:
@ -354,8 +351,11 @@ class GedcomParser:
else: else:
self.groups = (int(l[0]),l[1],l[2]) self.groups = (int(l[0]),l[1],l[2])
except: except:
msg = _("Warning: line %d was not understood, so it was ignored.") % self.index if self.text == "":
msg = "%s\n\t%s\n" % (msg,self.text) msg = _("Warning: line %d was blank, so it was ignored.\n") % self.index
else:
msg = _("Warning: line %d was not understood, so it was ignored.") % self.index
msg = "%s\n\t%s\n" % (msg,self.text)
self.errmsg(msg) self.errmsg(msg)
self.error_count = self.error_count + 1 self.error_count = self.error_count + 1
self.groups = (999, "XXX", "XXX") self.groups = (999, "XXX", "XXX")
@ -518,7 +518,8 @@ class GedcomParser:
noteobj = RelLib.Note() noteobj = RelLib.Note()
self.nmap[matches[1]] = noteobj self.nmap[matches[1]] = noteobj
text = matches[2][4:] text = matches[2][4:]
noteobj.append(text + self.parse_continue_data(1)) # noteobj.append(text + self.parse_continue_data(1))
noteobj.append(text + self.parse_note_continue(1))
self.parse_note_data(1) self.parse_note_data(1)
elif matches[1] == "TRLR": elif matches[1] == "TRLR":
self.backup() self.backup()