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

2007-04-15 Don Allingham <don@gramps-project.org>

Browse Source 
* src/GrampsDb/_WriteGedcom.py: use CONT to continue page info
	* src/GrampsDb/_GrampsBSDDB.py: additional error checking
	* src/QuestionDialog.py: enable markup
	* src/DbLoader.py: additional error checking

	* src/plugins/NarrativeWeb.py
	* src/ReportBase/_ReportUtils.py
	0001012: Private source and private child references shown in narrative 
	website.
	0001017: Insufficient space in pedigree view of narrative website


svn: r8386
This commit is contained in:
Don Allingham
2007-04-16 01:19:46 +00:00
parent 6468dc2a23
commit 43e3bf68cd
5 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GrampsDb/_GrampsBSDDB.py
View File

@@ -1451,7 +1451,7 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
if self.UseTXN:
self.txn = self.env.txn_begin()
status = GrampsDbBase.undo(self,update_history)
if self.UseTXN:
if self.UseTXN and self.txn:
if status:
self.txn.commit()
else:

5
src/GrampsDb/_WriteGedcom.py
View File

@@ -1388,8 +1388,9 @@ class GedcomWriter(UpdateCallback):
# Reference to the source
self.writeln("%d SOUR @%s@" % (level,src.get_gramps_id()))
if ref.get_page() != "":
page_text = self.cnvtxt(ref.get_page().replace('\n',' ; '))
self.writeln('%d PAGE %s' % (level+1,page_text))
sep = "\n%d CONT " % (level+2)
page_text = self.cnvtxt(ref.get_page().replace('\n', sep))
self.writeln('%d PAGE %s' % (level+1, page_text))
conf = ref.get_confidence_level()
# Cap the maximum level
conf = min(conf,RelLib.SourceRef.CONF_VERY_HIGH)