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

6878: CLI import/export plugins broken w/o DISPLAY

Browse Source 
Reapply from gramps40.

commit b2977abeab0be3c9edd85f26f9c151d82198921c
Author: Vassilii Khachaturov <vassilii@tarunz.org>
Date:   Wed Aug 21 18:54:21 2013 +0000

    Replace a hardwired ProgressMeter with proper calls to User

    Tested with impex.sh with and without DISPLAY env

    git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/branches/maintenance/gramps40@22901 4ae1f11a-8b86-4847-b8af-ab372f36d1fd

commit d67eda455f4f8c97e34ec7c85fb0bcf3a9c3b940
Author: Vassilii Khachaturov <vassilii@tarunz.org>
Date:   Wed Aug 21 18:54:05 2013 +0000

    6957: support gender in vcard import

    forgotten merge cleanup

    git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/branches/maintenance/gramps40@22900 4ae1f11a-8b86-4847-b8af-ab372f36d1fd

svn: r22911
This commit is contained in:
Vassilii Khachaturov 2013-08-23 08:48:02 +00:00
parent ffa6b33db8
commit 87badc8907
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gramps/plugins/importer/importcsv.py
View File

@ -56,7 +56,6 @@ from gramps.gen.plug.utils import OpenFileOrStdin
from gramps.gen.datehandler import parser as _dp from gramps.gen.datehandler import parser as _dp
from gramps.gen.utils.string import gender as gender_map from gramps.gen.utils.string import gender as gender_map
from gramps.gen.utils.id import create_id from gramps.gen.utils.id import create_id
from gramps.gui.utils import ProgressMeter
from gramps.gen.lib.eventroletype import EventRoleType from gramps.gen.lib.eventroletype import EventRoleType
from gramps.gen.constfunc import cuni, conv_to_unicode, STRTYPE from gramps.gen.constfunc import cuni, conv_to_unicode, STRTYPE
from gramps.gen.config import config from gramps.gen.config import config
@ -326,15 +325,18 @@ class CSVParser(object):
:param filehandle: open file handle positioned at start of the file :param filehandle: open file handle positioned at start of the file
""" """
data = self.read_csv(filehandle) data = self.read_csv(filehandle)
progress = ProgressMeter(_('CSV Import')) progress_title = _('CSV Import')
progress.set_pass(_('Reading data...'), 1) self.user.begin_progress(progress_title,
progress.set_pass(_('Importing data...'), len(data)) _('Reading data...'), 1)
self.user.end_progress()
self.user.begin_progress(progress_title,
_('Importing data...'), len(data))
tym = time.time() tym = time.time()
self.db.disable_signals() self.db.disable_signals()
with DbTxn(_("CSV import"), self.db, batch=True) as self.trans: with DbTxn(_("CSV import"), self.db, batch=True) as self.trans:
if self.default_tag and self.default_tag.handle is None: if self.default_tag and self.default_tag.handle is None:
self.db.add_tag(self.default_tag, self.trans) self.db.add_tag(self.default_tag, self.trans)
self._parse_csv_data(data, progress) self._parse_csv_data(data)
self.db.enable_signals() self.db.enable_signals()
self.db.request_rebuild() self.db.request_rebuild()
tym = time.time() - tym tym = time.time() - tym
@ -343,9 +345,9 @@ class CSVParser(object):
LOG.debug(msg) LOG.debug(msg)
LOG.debug("New Families: %d" % self.fam_count) LOG.debug("New Families: %d" % self.fam_count)
LOG.debug("New Individuals: %d" % self.indi_count) LOG.debug("New Individuals: %d" % self.indi_count)
progress.close() self.user.end_progress()
def _parse_csv_data(self, data, progress=None): def _parse_csv_data(self, data):
"""Parse each line of the input data and act accordingly.""" """Parse each line of the input data and act accordingly."""
self.lineno = 0 self.lineno = 0
self.index = 0 self.index = 0
@ -356,8 +358,7 @@ class CSVParser(object):
header = None header = None
line_number = 0 line_number = 0
for row in data: for row in data:
if progress is not None: self.user.step_progress()
progress.step()
line_number += 1 line_number += 1
if "".join(row) == "": # no blanks are allowed inside a table if "".join(row) == "": # no blanks are allowed inside a table
header = None # clear headers, ready for next "table" header = None # clear headers, ready for next "table"

4
gramps/plugins/importer/importvcard.py
View File

@ -521,9 +521,9 @@ class VCardParser(object):
gender_value = gender_value.upper() gender_value = gender_value.upper()
gender_value = gender_value[0] gender_value = gender_value[0]
if gender_value == 'M': if gender_value == 'M':
gender = gen.lib.Person.MALE gender = Person.MALE
elif gender_value == 'F': elif gender_value == 'F':
gender = gen.lib.Person.FEMALE gender = Person.FEMALE
else: else:
return return
self.person.set_gender(gender) self.person.set_gender(gender)