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

Set author for source on gedcom import

Browse Source 
svn: r6351
This commit is contained in:
Don Allingham 2006-04-17 22:33:13 +00:00
parent 1ca0d3d9e1
commit 943f01ff9f
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2006-04-17 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcom.py: set author properly for GEDCOM name
on default source
2006-04-16 Brian Matherly <pez4brian@users.sourceforge.net> 2006-04-16 Brian Matherly <pez4brian@users.sourceforge.net>
* src/plugins/DescendReport.py: Don't sort children (Bug #1453010) * src/plugins/DescendReport.py: Don't sort children (Bug #1453010)

16
gramps2/src/GrampsDb/_ReadGedcom.py
View File

@ -1766,7 +1766,9 @@ class GedcomParser:
self.def_src.set_title(_("Import from %s") % filename) self.def_src.set_title(_("Import from %s") % filename)
elif matches[1] == TOKEN_COPR: elif matches[1] == TOKEN_COPR:
self.def_src.set_publication_info(matches[2]) self.def_src.set_publication_info(matches[2])
elif matches[1] in (TOKEN_CORP,TOKEN_DATA,TOKEN_SUBM,TOKEN_SUBN,TOKEN_LANG): elif matches[1] == TOKEN_SUBM:
self.parse_subm(1)
elif matches[1] in (TOKEN_CORP,TOKEN_DATA,TOKEN_SUBN,TOKEN_LANG):
self.ignore_sub_junk(2) self.ignore_sub_junk(2)
elif matches[1] == TOKEN_DEST: elif matches[1] == TOKEN_DEST:
if genby == "GRAMPS": if genby == "GRAMPS":
@ -1795,6 +1797,18 @@ class GedcomParser:
else: else:
self.barf(2) self.barf(2)
def parse_subm(self, level):
while True:
matches = self.get_next()
if int(matches[0]) < level:
self.backup()
return
elif matches[1] == TOKEN_NAME:
self.def_src.set_author(matches[2])
else:
self.ignore_sub_junk(2)
def parse_ftw_schema(self,level): def parse_ftw_schema(self,level):
while True: while True:
matches = self.get_next() matches = self.get_next()