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

2006-10-09 Don Allingham <don@gramps-project.org>

Browse Source 
* src/GrampsDb/_ReadGedcom.py: fix object importation



svn: r7382
This commit is contained in:
Don Allingham 2006-10-10 04:11:57 +00:00
parent 82f2d2d69d
commit 93e7b3066b
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2006-10-09 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcom.py: fix object importation
2006-10-09 Alex Roitman <shura@gramps-project.org> 2006-10-09 Alex Roitman <shura@gramps-project.org>
* src/ReportBase/_BareReportDialog.py (setup_title): Set name to * src/ReportBase/_BareReportDialog.py (setup_title): Set name to
empty string if no person is available. empty string if no person is available.

21
src/GrampsDb/_ReadGedcom.py
View File

@ -299,8 +299,8 @@ class IdFinder:
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
noteRE = re.compile(r"\s*\d+\s+\@(\S+)\@\s+NOTE(.*)$") noteRE = re.compile(r"\s*\d+\s+\@(\S+)\@\s+NOTE(.*)$")
contRE = re.compile(r"\s*\d+\s+CONT\s(.*)$") contRE = re.compile(r"\s*\d+\s+CONT\s?(.*)$")
concRE = re.compile(r"\s*\d+\s+CONC\s(.*)$") concRE = re.compile(r"\s*\d+\s+CONC\s?(.*)$")
personRE = re.compile(r"\s*\d+\s+\@(\S+)\@\s+INDI(.*)$") personRE = re.compile(r"\s*\d+\s+\@(\S+)\@\s+INDI(.*)$")
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -370,20 +370,26 @@ class NoteParser:
self.count += 1 self.count += 1
if innote: if innote:
match = contRE.match(text) match = contRE.match(text)
if match: if match:
print "MATCH CONT", text
noteobj.append("\n" + match.groups()[0]) noteobj.append("\n" + match.groups()[0])
continue continue
match = concRE.match(text) match = concRE.match(text)
if match: if match:
print "MATCH CONC", text
if broken: if broken:
noteobj.append(" " + match.groups()[0]) noteobj.append(" " + match.groups()[0])
else: else:
noteobj.append(match.groups()[0]) noteobj.append(match.groups()[0])
continue continue
# Here we have finished parsing CONT/CONC tags for the NOTE # Here we have finished parsing CONT/CONC tags for the NOTE
# and ignored the rest of the tags (SOUR,CHAN,REFN,RIN). # and ignored the rest of the tags (SOUR,CHAN,REFN,RIN).
print "> ", text
print noteobj.get()
innote = False innote = False
match = noteRE.match(text) match = noteRE.match(text)
if match: if match:
@ -693,6 +699,7 @@ class GedcomParser(UpdateCallback):
self.obje_func = { self.obje_func = {
TOKEN_FORM : self.func_obje_form, TOKEN_FORM : self.func_obje_form,
TOKEN_TITL : self.func_obje_title, TOKEN_TITL : self.func_obje_title,
TOKEN_FILE : self.func_obje_file,
TOKEN_NOTE : self.func_obje_note, TOKEN_NOTE : self.func_obje_note,
TOKEN_BLOB : self.func_obje_blob, TOKEN_BLOB : self.func_obje_blob,
TOKEN_REFN : self.func_obje_refn, TOKEN_REFN : self.func_obje_refn,
@ -987,10 +994,14 @@ class GedcomParser(UpdateCallback):
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
def func_obje_file(self, matches, media, level): def func_obje_file(self, matches, media, level):
(ok,path) = self.find_file(matches[2], self.dir_path) (ok, filename) = self.find_file(matches[2], self.dir_path)
if not ok: if not ok:
self.warn(_("Could not import %s") % filename) self.warn(_("Could not import %s") % filename[0])
path = filename.replace('\\',os.path.sep) path = filename[0].replace('\\',os.path.sep)
media.set_path(path)
media.set_mime_type(Mime.get_type(path))
if not media.get_description():
media.set_description(path)
def func_obje_ignore(self, matches, media, level): def func_obje_ignore(self, matches, media, level):
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)