Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tools] Implement lorisInstance in tools directory #9397

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

victori444
Copy link
Contributor

@victori444 victori444 commented Oct 8, 2024

Brief summary of changes

  • Implements lorisInstance in detect_conflicts.php

Testing instructions (if applicable)

  1. Run detect_conflicts.php and verify that no errors are thrown and that it functions as intended

Link(s) to related issue(s)

@victori444 victori444 added State: Needs work PR awaiting additional work by the author to proceed and removed State: Needs work PR awaiting additional work by the author to proceed labels Oct 8, 2024
@CamilleBeau
Copy link
Contributor

@victori444 Assigning to you to resolve conflicts and then I'll test / review!

@driusan
Copy link
Collaborator

driusan commented Nov 11, 2024

does this resolve the issue listed or only partially resolve it? (There are many places listed in the issue and merging it with "Resolved" will close the issue automatically)

@CamilleBeau
Copy link
Contributor

According to the comments of the issue, these were the only 2 remaining out of the initial list

@victori444 victori444 force-pushed the 2024_10_08_LorisInstance_In_Tools branch from 4b6a810 to 11e3717 Compare November 11, 2024 20:15
@victori444 victori444 removed their assignment Nov 12, 2024
Copy link
Contributor

@CamilleBeau CamilleBeau left a comment

Choose a reason for hiding this comment

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

I'm getting a lot of these when running detect_conflicts -r all -y:
image

@CamilleBeau CamilleBeau added the State: Needs work PR awaiting additional work by the author to proceed label Nov 18, 2024
@victori444 victori444 removed their assignment Nov 19, 2024
@victori444 victori444 removed the State: Needs work PR awaiting additional work by the author to proceed label Nov 19, 2024
@CamilleBeau CamilleBeau added the State: Needs work PR awaiting additional work by the author to proceed label Nov 25, 2024
@victori444 victori444 removed the State: Needs work PR awaiting additional work by the author to proceed label Dec 6, 2024
Copy link
Contributor

@CamilleBeau CamilleBeau left a comment

Choose a reason for hiding this comment

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

Getting this error when running:

(base) lorisadmin@cbeaudoin-dev:/var/www/loris/tools$ php detect_conflicts.php -r all -y
Array
(
[r] => all
[y] =>
)
Removing ignored conflicts

PHP Fatal error: Uncaught Error: Cannot use object of type LORIS\Database\Query as array in /var/www/loris/tools/detect_conflicts.php:595
Stack trace:
#0 /var/www/loris/tools/detect_conflicts.php(146): detectIgnoreColumns()
#1 {main}
thrown in /var/www/loris/tools/detect_conflicts.php on line 595

@CamilleBeau CamilleBeau added the State: Needs work PR awaiting additional work by the author to proceed label Dec 9, 2024
@victori444 victori444 force-pushed the 2024_10_08_LorisInstance_In_Tools branch from 588142f to 15fa08b Compare December 13, 2024 15:59
@victori444
Copy link
Contributor Author

Getting this error when running:

(base) lorisadmin@cbeaudoin-dev:/var/www/loris/tools$ php detect_conflicts.php -r all -y
Array
(
[r] => all
[y] =>
)
Removing ignored conflicts
PHP Fatal error: Uncaught Error: Cannot use object of type LORIS\Database\Query as array in /var/www/loris/tools/detect_conflicts.php:595
Stack trace:
#0 /var/www/loris/tools/detect_conflicts.php(146): detectIgnoreColumns()
#1 {main}
thrown in /var/www/loris/tools/detect_conflicts.php on line 595

Hm I don't get this error - I think this may be the error that the PR changes resolve since line 595 in the current script is where $commentids is being accessed as an array ($commentids[0]['CommentID'])

Copy link
Contributor

@CamilleBeau CamilleBeau left a comment

Choose a reason for hiding this comment

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

Printing a bunch of blank lines when running this - can you check to see if that's happening for you also?

@victori444 victori444 removed the State: Needs work PR awaiting additional work by the author to proceed label Jan 30, 2025
Copy link
Contributor

@CamilleBeau CamilleBeau left a comment

Choose a reason for hiding this comment

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

Gave this another test, it looks like the script is not compatible for linst instruments.
image

It also seems as thought here may be an issue with detecting the conflicts - I created a conflict (participant MTL008 in raisinbread, radiology review in timepoint V1) and nothing was printed out in the script

@CamilleBeau CamilleBeau added the State: Needs work PR awaiting additional work by the author to proceed label Feb 4, 2025
@driusan driusan added this to the 27.0.0 milestone Feb 17, 2025
@victori444
Copy link
Contributor Author

Fixed on my end (not pushed yet) to work for linst instruments & properly detect ignored conflicts - this is to be revisited as the script may need to be optimized for memory usage

@driusan
Copy link
Collaborator

driusan commented Mar 11, 2025

If there are fixes needed for memory usage that sounds like a different issue. Is this ready to merge?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
State: Needs work PR awaiting additional work by the author to proceed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[tools] Implement LorisInstance in tools directory
3 participants