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

* src/ArgHandler.py (ArgHandler.cl_export): Properly expand filename.

Browse Source 
* src/GrampsDb/_WriteGrdb.py (exportData): Use placeholder if
	callback is None.


svn: r7042
This commit is contained in:
Alex Roitman 2006-07-19 04:56:41 +00:00
parent e6a2949327
commit 54a6eeb818
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,4 +1,7 @@
2006-07-18 Alex Roitman <shura@gramps-project.org> 2006-07-18 Alex Roitman <shura@gramps-project.org>
* src/ArgHandler.py (ArgHandler.cl_export): Properly expand filename.
* src/GrampsDb/_WriteGrdb.py (exportData): Use placeholder if
callback is None.
* src/GrampsDb/_GrampsBSDDB.py * src/GrampsDb/_GrampsBSDDB.py
(_delete_primary_from_reference_map): defer deleting until the (_delete_primary_from_reference_map): defer deleting until the
cursor is closed. cursor is closed.

1
src/ArgHandler.py
View File

@ -543,6 +543,7 @@ class ArgHandler:
Try to write into filename using the format. Try to write into filename using the format.
Any errors will cause the os._exit(1) call. Any errors will cause the os._exit(1) call.
""" """
filename = os.path.abspath(os.path.expanduser(filename))
if format == 'grdb': if format == 'grdb':
try: try:
GrampsDb.gramps_db_writer_factory(const.app_gramps)( GrampsDb.gramps_db_writer_factory(const.app_gramps)(

6
src/GrampsDb/_WriteGrdb.py
View File

@ -44,8 +44,14 @@ from _DbUtils import db_copy
# Importing data into the currently open database. # Importing data into the currently open database.
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
def cli_callback(val):
pass
def exportData(database, filename, person=None, callback=None, cl=False): def exportData(database, filename, person=None, callback=None, cl=False):
if callback == None:
callback = cli_callback
filename = os.path.normpath(filename) filename = os.path.normpath(filename)
new_database = GrampsBSDDB() new_database = GrampsBSDDB()
try: try: