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

Improved documenatation generators, fixed GEDCOM note read problem

Browse Source 
svn: r27
This commit is contained in:
Don Allingham
2001-05-17 23:12:07 +00:00
parent 457ea855d6
commit 8c11e3ac09
10 changed files with 175 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/ReadGedcom.py
View File

@@ -165,8 +165,8 @@ def importData(database, filename):
total = len(allLines)
value = 0
for index in range(1,21):
value = value + total/20
for index in range(1,51):
value = value + total/50
values[index] = value
index = 1
@@ -179,9 +179,9 @@ def importData(database, filename):
elif encoding == 2:
line = latin_utf8.utf8_to_latin(line)
if currentLine == value and index <= 20:
if currentLine == value and index <= 50:
index = index + 1
if index <= 20:
if index <= 50:
value = values[index]
progressWindow.set_percentage(float(currentLine)/float(total))
while events_pending():
@@ -402,6 +402,13 @@ def importData(database, filename):
inlocalNote = 0
person.setNote(user2note[noteId])
regex_match = noterefRegexp.match(line)
if regex_match :
matches = regex_match.groups()
print "found note",matches[0]
person2note[person] = matches[0]
continue
regex_match = noteactRegexp.match(line)
if regex_match :
inlocalNote = 1
@@ -429,12 +436,6 @@ def importData(database, filename):
mySource.setPage(matches[0])
continue
regex_match = noterefRegexp.match(line)
if regex_match :
matches = regex_match.groups()
person2note[person] = matches[0]
continue
regex_match = genderRegexp.match(line)
if regex_match :
matches = regex_match.groups()
@@ -645,11 +646,10 @@ def on_ok_clicked(obj):
statusWindow.destroy()
except IOError, val:
GnomeErrorDialog("Could not load " + name + "\n" + val[1])
except:
GnomeErrorDialog("Could not load " + name + \
"\n due to an unexpected internal error")
statusWindow.destroy()
# except:
# GnomeErrorDialog("Could not load " + name + \
# "\n due to an unexpected internal error")
# statusWindow.destroy()
#-------------------------------------------------------------------------
#