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

* src/GrampsDbUtils/_GedcomParser.py: fix a few bugs

Browse Source 
svn: r8216
This commit is contained in:
Don Allingham 2007-02-23 06:03:02 +00:00
parent 7ea025b932
commit ee407ca871
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,4 +1,5 @@
2007-02-22 Don Allingham <don@gramps-project.org> 2007-02-22 Don Allingham <don@gramps-project.org>
* src/GrampsDbUtils/_GedcomParser.py: fix a few bugs
* src/DataViews/_PedigreeView.py: remove redundant call * src/DataViews/_PedigreeView.py: remove redundant call
* src/PageView.py: remove redundant call * src/PageView.py: remove redundant call
* src/ViewManager.py: pylint fixes * src/ViewManager.py: pylint fixes

16
src/GrampsDbUtils/_GedcomParse.py
View File

@ -278,10 +278,13 @@ class StageOne:
for line in self.ifile: for line in self.ifile:
self.lcnt +=1 self.lcnt +=1
data = line.split(None,2) + [''] data = line.split(None,2) + ['']
try:
(level, key, value) = data[:3] (level, key, value) = data[:3]
value = value.strip() value = value.strip()
level = int(level) level = int(level)
key = key.strip() key = key.strip()
except:
raise Errors.GedcomError("Corrupted file at line %d" % self.lcnt)
if level == 0: if level == 0:
if value == "FAM": if value == "FAM":
@ -2905,12 +2908,12 @@ class GedcomParser(UpdateCallback):
""" """
state.location = RelLib.Location() state.location = RelLib.Location()
state.location.set_street(line.data) state.location.set_street(line.data)
state.note = None state.note = []
self.parse_level(state, self.parse_loc_tbl, self.func_undefined) self.parse_level(state, self.parse_loc_tbl, self.func_undefined)
location = state.location location = state.location
note = state.note note_list = state.note
place_handle = state.event.get_place_handle() place_handle = state.event.get_place_handle()
if place_handle: if place_handle:
@ -2929,7 +2932,7 @@ class GedcomParser(UpdateCallback):
place_handle = place.handle place_handle = place.handle
place.set_main_location(location) place.set_main_location(location)
if note: for note in note_list:
place.add_note(note) place.add_note(note)
state.event.set_place_handle(place_handle) state.event.set_place_handle(place_handle)
@ -3250,9 +3253,7 @@ class GedcomParser(UpdateCallback):
""" """
date, text = self.parse_source_data(state.level+1) date, text = self.parse_source_data(state.level+1)
if date: if date:
import DateHandler state.src_ref.set_date_object(date)
date_obj = DateHandler.parser.parse(date)
state.src_ref.set_date_object(date_obj)
state.src_ref.set_text(text) state.src_ref.set_text(text)
def func_srcref_obje(self, line, state): def func_srcref_obje(self, line, state):
@ -3869,8 +3870,7 @@ class GedcomParser(UpdateCallback):
""" """
if not state.location: if not state.location:
state.location = RelLib.Location() state.location = RelLib.Location()
self.parse_note(line, state.location, state.level+1) self.parse_note(line, state.note, state.level+1)
def map_ancestry_com(self, original_gid): def map_ancestry_com(self, original_gid):
""" """

2
src/GrampsDbUtils/_GedcomTokens.py
View File

@ -231,5 +231,5 @@ tokens = {
"_PRIM" : TOKEN_IGNORE,"_SSHOW" : TOKEN_IGNORE, "_PRIM" : TOKEN_IGNORE,"_SSHOW" : TOKEN_IGNORE,
"_PAREN" : TOKEN_IGNORE,"BLOB" : TOKEN_BLOB, "_PAREN" : TOKEN_IGNORE,"BLOB" : TOKEN_BLOB,
"CONL" : TOKEN_CONL, "RESN" : TOKEN_RESN, "CONL" : TOKEN_CONL, "RESN" : TOKEN_RESN,
"_MEDI" : TOKEN_MEDI, "_MEDI" : TOKEN_MEDI, "_MASTER" : TOKEN_IGNORE,
} }

4
src/GrampsDbUtils/_ReadGedcom.py
View File

@ -80,6 +80,10 @@ def import2(database, filename, callback, code_set, use_trans):
except IOError, msg: except IOError, msg:
ErrorDialog(_("%s could not be opened\n") % filename, str(msg)) ErrorDialog(_("%s could not be opened\n") % filename, str(msg))
return return
except Errors.GedcomError, msg:
ErrorDialog(_("Invalid GEDCOM file"),
_("%s could not be imported") % filename + "\n" + str(msg))
return
if database.get_number_of_people() == 0: if database.get_number_of_people() == 0:

2
src/docgen/ODFDoc.py
View File

@ -1113,7 +1113,7 @@ class ODFDoc(BaseDoc.BaseDoc):
self.cntnt.write('<text:span text:style-name="F%s">' % para_name) self.cntnt.write('<text:span text:style-name="F%s">' % para_name)
text = text.replace('\t','<text:tab-stop/>') text = text.replace('\t','<text:tab-stop/>')
text = text.replace('\n','<text:line-break/>') text = text.replace('\n','<text:line-break/>')
self.cntnt.write(text) self.cntnt.write(escape(text))
self.cntnt.write('</text:span>') self.cntnt.write('</text:span>')
self.cntnt.write('</text:p>\n') self.cntnt.write('</text:p>\n')
self.cntnt.write('</draw:rect>\n') self.cntnt.write('</draw:rect>\n')