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

attach it to people and families with no attached sources.

Browse Source 
svn: r3757
This commit is contained in:
Don Allingham 2004-11-27 02:54:31 +00:00
parent 38a473eee7
commit 4fa741f5ce
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps2/ChangeLog
View File

@ -2,7 +2,7 @@
* src/DisplayModels.py: fix Source column display * src/DisplayModels.py: fix Source column display
* src/GrampsDbBase.py: change default display columns * src/GrampsDbBase.py: change default display columns
* src/ReadGedcom.py: Add default source for a GEDCOM import, * src/ReadGedcom.py: Add default source for a GEDCOM import,
attach it to a person that has no attached sources. attach it to people and families with no attached sources.
2004-11-25 Alex Roitman <shura@alex.neuro.umn.edu> 2004-11-25 Alex Roitman <shura@alex.neuro.umn.edu>
* src/RecentFiles.py: Make robust to parse/save problems. * src/RecentFiles.py: Make robust to parse/save problems.

23
gramps2/src/ReadGedcom.py
View File

@ -176,7 +176,7 @@ def import2(database, filename, cb, codeset, use_trans):
return return
except: except:
Utils.destroy_passed_object(statusWindow) Utils.destroy_passed_object(statusWindow)
ErrorDialog(_("%s could not be opened\n") % filename) DisplayTrace.DisplayTrace()
return return
if database.get_number_of_people() == 0: if database.get_number_of_people() == 0:
@ -209,7 +209,6 @@ def import2(database, filename, cb, codeset, use_trans):
cb(1) cb(1)
elif callback: elif callback:
callback() callback()
print "callback done"
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -231,7 +230,7 @@ class GedcomParser:
SyntaxError = "Syntax Error" SyntaxError = "Syntax Error"
BadFile = "Not a GEDCOM file" BadFile = "Not a GEDCOM file"
def __init__(self, dbase, file, window, codeset): def __init__(self, dbase, filename, window, codeset):
self.dp = DateParser.DateParser() self.dp = DateParser.DateParser()
self.db = dbase self.db = dbase
self.person = None self.person = None
@ -245,7 +244,9 @@ class GedcomParser:
self.gedmap = GedcomInfoDB() self.gedmap = GedcomInfoDB()
self.gedsource = None self.gedsource = None
self.def_src = RelLib.Source() self.def_src = RelLib.Source()
self.dir_path = os.path.dirname(file) fname = os.path.basename(filename).split('\\')[-1]
self.def_src.set_title(_("Import from %s") % unicode(fname))
self.dir_path = os.path.dirname(filename)
self.localref = 0 self.localref = 0
self.placemap = {} self.placemap = {}
self.broken_conc_list = [ 'FamilyOrigins', 'FTW' ] self.broken_conc_list = [ 'FamilyOrigins', 'FTW' ]
@ -257,8 +258,8 @@ class GedcomParser:
self.lid2id = {} self.lid2id = {}
self.fid2id = {} self.fid2id = {}
self.f = open(file,"rU") self.f = open(filename,"rU")
self.filename = file self.filename = filename
self.index = 0 self.index = 0
self.backoff = 0 self.backoff = 0
self.override = codeset self.override = codeset
@ -278,7 +279,7 @@ class GedcomParser:
else: else:
self.cnv = nocnv self.cnv = nocnv
self.geddir = os.path.dirname(os.path.normpath(os.path.abspath(file))) self.geddir = os.path.dirname(os.path.normpath(os.path.abspath(filename)))
self.transtable = string.maketrans('','') self.transtable = string.maketrans('','')
self.delc = self.transtable[0:31] self.delc = self.transtable[0:31]
@ -307,7 +308,7 @@ class GedcomParser:
self.gedattr[amap[val]] = val self.gedattr[amap[val]] = val
if self.window: if self.window:
self.update(self.file_obj,os.path.basename(file)) self.update(self.file_obj,os.path.basename(filename))
self.search_paths = [] self.search_paths = []
@ -580,6 +581,10 @@ class GedcomParser:
if child: if child:
child.add_address(self.addr) child.add_address(self.addr)
self.db.commit_person(child, self.trans) self.db.commit_person(child, self.trans)
if len(self.family.get_source_references()) == 0:
sref = RelLib.SourceRef()
sref.set_base_handle(self.def_src.get_handle())
self.family.add_source_reference(sref)
self.db.commit_family(self.family, self.trans) self.db.commit_family(self.family, self.trans)
del self.family del self.family
elif matches[2] == "INDI": elif matches[2] == "INDI":
@ -1642,7 +1647,7 @@ class GedcomParser:
pass pass
elif matches[1] == "FILE": elif matches[1] == "FILE":
filename = os.path.basename(matches[2]).split('\\')[-1] filename = os.path.basename(matches[2]).split('\\')[-1]
self.def_src.set_title(unicode(filename)) self.def_src.set_title(_("Import from %s") % unicode(filename))
elif matches[1] == "COPR": elif matches[1] == "COPR":
self.def_src.set_publication_info(unicode(matches[2])) self.def_src.set_publication_info(unicode(matches[2]))
elif matches[1] in ["CORP","DATA","SUBM","SUBN","LANG"]: elif matches[1] in ["CORP","DATA","SUBM","SUBN","LANG"]: