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

revert part of 8014 patch, pending further review

Browse Source
This commit is contained in:
Paul Franklin 2014-08-25 11:27:46 -07:00
parent 2203f28b28
commit 82294e6a82
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/import/ImportGedcom.py
View File

@ -74,15 +74,11 @@ def importData(database, filename, callback=None):
ansel = False
gramps = False
code_set = ''
for index in range(50):
line = ifile.readline().split()
if len(line) == 0:
break
if len(line) > 2 and line[1][0:4] == 'CHAR':
if line[2] in ('UTF-8', 'ANSI', 'ASCII'):
code_set = line[2]
elif line[2] == 'ANSEL':
if len(line) > 2 and line[1][0:4] == 'CHAR' and line[2] == "ANSEL":
ansel = True
if len(line) > 2 and line[1][0:4] == 'SOUR' and line[2] == "GRAMPS":
gramps = True
@ -97,6 +93,8 @@ def importData(database, filename, callback=None):
enc = ['ANSEL', 'ANSEL', 'ANSI', 'ASCII', 'UTF-8']
code_set = enc[ code.get_active()]
dialog.destroy()
else:
code_set = ""
assert(isinstance(code_set, basestring))