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 345ac87e95
commit c3274fe930
5 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps2/ChangeLog
View File

@ -1,3 +1,9 @@
2007-04-15 Don Allingham <don@gramps-project.org>
* 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
2007-04-14 Brian Matherly <brian@gramps-project.org> 2007-04-14 Brian Matherly <brian@gramps-project.org>
* src/plugins/NarrativeWeb.py * src/plugins/NarrativeWeb.py
* src/ReportBase/_ReportUtils.py * src/ReportBase/_ReportUtils.py

15
gramps2/src/DbLoader.py
View File

@ -446,23 +446,26 @@ class DbLoader:
os.chdir(os.path.dirname(filename)) os.chdir(os.path.dirname(filename))
except: except:
print "could not change directory" print "could not change directory"
except DBRunRecoveryError, msg: except (DBAccessError, DBPageNotFoundError,
DBInvalidArgError, DBRunRecoveryError), msg:
QuestionDialog.ErrorDialog( QuestionDialog.ErrorDialog(
_("Low level database corruption detected"), _("Low level database corruption detected"),
_("GRAMPS has detected a problem in the underlying " _("GRAMPS has detected a problem in the underlying "
"Berkeley database. Please exit the program, and GRAMPS " "Berkeley database. <b>If you have renamed this file, "
"change the name back to its original name. If you have "
"copied the file from another machine, this file is not "
"usable</b>. Export your data to XML on the original machine "
"and import it into a new database.\n\nOtherwise, "
"please exit the program, and GRAMPS "
"will attempt to run the recovery repair operation " "will attempt to run the recovery repair operation "
"the next time you open this database. If this " "the next time you open this database. If this "
"problem persists, create a new database, import " "problem persists, create a new database, import "
"from a backup database, and report the problem to " "from a backup database, and report the problem to "
"gramps-bugs@lists.sourceforge.net.")) "gramps-bugs@lists.sourceforge.net."))
except (DBAccessError, DBPageNotFoundError,DBInvalidArgError), msg: except:
QuestionDialog.ErrorDialog( QuestionDialog.ErrorDialog(
_("Could not open file: %s") % filename, _("Could not open file: %s") % filename,
str(msg[1])) str(msg[1]))
except Exception:
log.error("Failed to open database.", exc_info=True)
return True return True
def open_saved_as(self, filename, filetype): def open_saved_as(self, filename, filetype):

2
gramps2/src/GrampsDb/_GrampsBSDDB.py
View File

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

5
gramps2/src/GrampsDb/_WriteGedcom.py
View File

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

2
gramps2/src/QuestionDialog.py
View File

@ -171,7 +171,7 @@ class ErrorDialog(gtk.MessageDialog):
type=gtk.MESSAGE_ERROR, type=gtk.MESSAGE_ERROR,
buttons=gtk.BUTTONS_CLOSE) buttons=gtk.BUTTONS_CLOSE)
self.set_markup('<span weight="bold" size="larger">%s</span>' % msg1) self.set_markup('<span weight="bold" size="larger">%s</span>' % msg1)
self.format_secondary_text(msg2) self.format_secondary_markup(msg2)
self.set_icon(ICON) self.set_icon(ICON)
self.set_title("%s - GRAMPS" % msg1) self.set_title("%s - GRAMPS" % msg1)
self.show() self.show()