obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

data import: entries now counted if there are multiple files

Browse Source
This commit is contained in:
Celine Mercier
2019-03-18 18:16:39 +01:00
parent 7e20870719
commit 802a3f5933
2 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
python/obitools3/commands/import.pyx
View File

@ -130,8 +130,11 @@ def run(config):
output[0].record_command_line(" ".join(sys.argv[1:]))
output[0].close()
return
pb = ProgressBar(entry_count, config, seconde=5)
if entry_count >= 0:
pb = ProgressBar(entry_count, config, seconde=5)
else:
pb = None
entries = input[1]
@ -161,7 +164,8 @@ def run(config):
else:
raise RollbackException("obi import error, rollbacking view", view)
pb(i)
if pb is not None:
pb(i)
if NUC_SEQS_view:
id_col[i] = entry.id
@ -271,10 +275,11 @@ def run(config):
# Fill value
dcols[tag][0][i] = value
i+=1 # TODO Not if None sequence
i+=1
pb(i, force=True)
print("", file=sys.stderr)
if pb is not None:
pb(i, force=True)
print("", file=sys.stderr)
# Save command config in View and DMS comments
command_line = " ".join(sys.argv[1:])