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

Remove GrampsDbUtils/importdbdir.py. You can't import database directories from the GUI,and there is no need to import them from the CLI. You can still open a database directory from the CLI.

Browse Source 
svn: r11145
This commit is contained in:
Brian Matherly
2008-10-15 03:29:41 +00:00
parent e9c1b1de89
commit 5f7ef33cdc
5 changed files with 6 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ArgHandler.py
View File

@@ -199,21 +199,10 @@ class ArgHandler:
fname = value
fullpath = os.path.abspath(os.path.expanduser(fname))
format = 'famtree'
format = None
ftype = Mime.get_type(fullpath)
if not os.path.exists(fullpath):
#see if not just a name of a database is given
data = self.dbman.family_tree(fname)
if data is not None:
fname, ftype, title = data
else:
print "Input file does not exist: %s" % fullpath
continue
elif os.path.isdir(fullpath):
ftype = const.APP_FAMTREE
fname = fullpath
elif opt_ix<len(options)-1 \
and options[opt_ix+1][0] in ( '-f', '--format'):
if opt_ix<len(options)-1 \
and options[opt_ix+1][0] in ( '-f', '--format'):
format = options[opt_ix+1][1]
if format not in ('gedcom',
'gramps-xml',
@@ -404,7 +393,7 @@ class ArgHandler:
else:
filename = os.path.abspath(os.path.expanduser(self.open_gui))
filetype = Mime.get_type(filename)
if filetype in ('x-directory/normal',):
if filetype is const.APP_FAMTREE:
success = True
pass
elif filetype in IMPORT_TYPES:
@@ -539,17 +528,7 @@ class ArgHandler:
Command-line import routine. Try to import filename using the format.
Any errors will cause the sys.exit(1) call.
"""
if format == 'famtree':
#3.x database
if not self.__check_db(filename):
sys.exit(0)
try:
GrampsDbUtils.gramps_db_reader_factory(const.APP_FAMTREE)(
self.state.db, filename, empty)
except AttributeError:
print "Error importing Family Tree %s" % filename
sys.exit(1)
elif format == 'grdb':
if format == 'grdb':
#2.x database
filename = os.path.normpath(os.path.abspath(filename))
try: