[post 19.0.0 release] loris-mri-docs: forward changes from v19.0.0 and resolve conflicts #280
Conversation
Add incoming site as config option.
Profile template Modification
…re recent dcmodify).
Fixed the dcmodify --insert-tag option to --insert
…cations Modification to the profileTemplate to be able to use DTIPrep pipeline
… object. Other fails while reading content of dcm source directory
Modified $d to $dir in profileTemplate
lookupCenterID using patient name instead of PatientID
…le (aces#260) * Better MINC toolkit sourcing command and updated VERSION file * cecile feedback
…FileID to NULL in files_qcstatus and feedback_mri_comments (aces#261)
…hs (Redmine 13915) (aces#272) * Populate Loris-MRI code path for new installs since the user is asked to enter the MRI project name * Populate other MRI data path with a better option than the default LORIS %PROJECTNAME * post installation checks * Add the condition Dave brought up during the imaging meeting; i.e. only change it for those that did not do it in the front end already * Ceciles feedback * oopsie
MounaSafiHarab
changed the title
|
@nicolasbrossard @cmadjar |
There was a problem hiding this comment.
@MounaSafiHarab I ran the scripts and noticed 2 things:
-
the getConfigSetting subroutine is present twice in DBI.pm (one with the documentation and one without the documentation)
-
I get this warning when running the tarchiveLoader script:
Illegal character in prototype for main::logHeader : $date,$tarchive,$TmpDir at tarchiveLoader line 767
I dug a little bit more and noticed that in your branch, the functionlogHeader ()has 3 arguments ($date,$tarchive,$TmpDir) in line 767 but is called without any argument at line 234. I looked into 19.0-dev and saw that the function is created without arguments at line 767.
Not sure I understand why I don't see this in the diff.
Let me know if it is unclear
uploadNeuroDB/NeuroDB/DBI.pm
Outdated
| @@ -65,6 +65,22 @@ sub connect_to_db | |||
| return $dbh; | |||
| } | |||
|
|
|||
| sub getConfigSetting | |||
There was a problem hiding this comment.
The getConfigSetting function is present twice in the DBI.pm file (one with the documentation and one without). Remove the one without the documentation.
There was a problem hiding this comment.
done, good catch!
I fixed item 1) But I think this should be fixed in the loris-mri-docs branch, not this pull request(issued here: #281). The arguments added to the function were in the loris-mri-docs branch and here all I am doing is to bring the 19.0-dev changes to the loris-mri-docs branch so it makes sense to have the funcrtion arguments (because they were on the loris-mri-docs branch)... |
|
@cmadjar |
@MounaSafiHarab #281 just got merged. Thank you!! |
and I just merged the loris-mri-docs/ branch here. thanks for catching those :)! |
|
@MounaSafiHarab Sorry, conflicts detected now that I merged #273 :S |
|
lol I expected it, it is fine, I am just happy we are moving forward with these pull requests, thanks to you! |
|
@cmadjar |
|
@nicolasbrossard looks all good on my end. If you approve the PR as well, could you merge it at the same time? Thanks!! |
tools/example_scripts/README.md
Outdated
| @@ -0,0 +1,9 @@ | |||
| ### Example scripts | |||
There was a problem hiding this comment.
this file should be removed as it was removed in loris-mri-docs/
No description provided.