Skip to content

[REF] Allow multiple XNAT servers to be used for upload / extraction#270

Merged
DESm1th merged 17 commits intoTIGRLab:masterfrom
DESm1th:kcni_xnat
Mar 31, 2020
Merged

[REF] Allow multiple XNAT servers to be used for upload / extraction#270
DESm1th merged 17 commits intoTIGRLab:masterfrom
DESm1th:kcni_xnat

Conversation

@DESm1th
Copy link
Copy Markdown
Contributor

@DESm1th DESm1th commented Mar 23, 2020

I forgot to update dm_xnat_upload and dm_xnat_extract to allow multiple xnat servers to be used for one study :( This fixes this oversight.

@auto-assign auto-assign bot requested review from edickie, gabiherman and jerdra March 23, 2020 18:34
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 23, 2020

Codecov Report

Merging #270 into master will increase coverage by 0.02%.
The diff coverage is 22.22%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #270      +/-   ##
==========================================
+ Coverage   31.04%   31.07%   +0.02%     
==========================================
  Files          54       54              
  Lines        8430     8490      +60     
==========================================
+ Hits         2617     2638      +21     
- Misses       5813     5852      +39     
Flag Coverage Δ
#unittests 31.07% <22.22%> (+0.02%) ⬆️
Impacted Files Coverage Δ
bin/dm_xnat_extract.py 0.00% <0.00%> (ø)
datman/xnat.py 28.35% <19.04%> (-0.98%) ⬇️
bin/dm_xnat_upload.py 20.45% <20.40%> (+0.90%) ⬆️
datman/scanid.py 86.44% <80.00%> (+1.31%) ⬆️
datman/config.py 57.63% <100.00%> (-0.44%) ⬇️
datman/exceptions.py 94.73% <100.00%> (+1.40%) ⬆️
tests/test_datman_scanid.py 100.00% <100.00%> (ø)
tests/test_dm_xnat_upload.py 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e2873f9...dc76298. Read the comment docs.

@DESm1th
Copy link
Copy Markdown
Contributor Author

DESm1th commented Mar 25, 2020

@edickie , @gabiherman , @jerdra This one is safe to review, I'm done updating it :) (I'm not going to add xnat related tests until we decide on whether to switch to a 3rd party xnat module or not).

jerdra
jerdra previously approved these changes Mar 30, 2020
Comment thread bin/dm_xnat_extract.py Outdated
Comment on lines 208 to 212
xnat_projects = get_projects(config)

# for each XNAT project send out URL request for list of experiment IDs
# then validate and add (connection, XNAT project, subject ID) to output
for project in xnat_projects:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
xnat_projects = get_projects(config)
# for each XNAT project send out URL request for list of experiment IDs
# then validate and add (connection, XNAT project, subject ID) to output
for project in xnat_projects:
# for each XNAT project send out URL request for list of experiment IDs
# then validate and add (connection, XNAT project, subject ID) to output
for project in get_projects(config):

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch! I couldnt push it exactly as you requested because of the nested loop, but I got rid of line 208

@DESm1th DESm1th merged commit 843b5ff into TIGRLab:master Mar 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants