Order the acquisitions per modality based on series number: Redmine 10959 #160
Conversation
|
Is there a script or patch that can be run on files that were already inserted into the DB? |
| # load the file object to get the series_number | ||
| while (my $row = $acqArr->fetchrow_hashref()) { | ||
| $acqProtID = $row->{'AcquisitionProtocolID'}; | ||
| $query = "SELECT f.FileID, f.ModalityOrder ". |
There was a problem hiding this comment.
I don't see any 'ModalityOrder' field in the files table. Am I misunderstanding that query? Unless it is meant to be the new field but in the loris pull request it has been named 'AcqOrderPerModality'.
There was a problem hiding this comment.
no, you understood it right. I misnamed it here (it was the original name I chose but then I updated it in Loris but forgot to update here). Thanks for the catch!
done now
| my $query = "SELECT DISTINCT f.AcquisitionProtocolID ". | ||
| "from files f "; | ||
| my $where = "WHERE f.TarchiveSource=?"; | ||
| $query = $query . $where; |
There was a problem hiding this comment.
The $where variable is not useful. I would write the whole query directly in the $query variable.
Also, FROM was not capitalized here (not crucial but to stay consistent)
| $query = "SELECT f.FileID, f.ModalityOrder ". | ||
| "from files f "; | ||
| $where = "WHERE f.TarchiveSource=? AND f.AcquisitionProtocolID=?"; | ||
| $query = $query . $where; |
There was a problem hiding this comment.
Same here. Get rid of the $where variable and capitalize "FROM"
| $dataArr = ${$this->{'dbhr'}}->prepare($query); | ||
| $dataArr->execute($tarchiveID, $acqProtID); | ||
| my (@fileID, @seriesNumber)=(); | ||
| my ($fileID, $seriesNumber)=(); |
There was a problem hiding this comment.
Why is this line repeated with @ (array) and $ (dereferenced array)?
| my ($fileID, $seriesNumber)=(); | ||
| my $i=0; | ||
| while (my $row2 = $dataArr->fetchrow_hashref()) { | ||
| $i++; |
There was a problem hiding this comment.
Incrementation should be put at the end of the loop as arrays start at index 0.
|
|
||
| my $order = 0; | ||
| foreach my $j (0..$#seriesNumber-1) { | ||
| $order++; |
There was a problem hiding this comment.
Will need to move incrementation at the end too.
| $order++; | ||
| $query = "UPDATE files f SET f.ModalityOrder=? "; | ||
| $where = "WHERE f.FileID=?"; | ||
| $query = $query . $where; |
There was a problem hiding this comment.
Same comment as before, the $where variable is not useful here. Remove it and write the query in one shot.
| my $modalityOrder_update = ${$this->{'dbhr'}}->prepare($query); | ||
| $modalityOrder_update->execute($order, $sorted_fileID[$order]); | ||
| $message = "The Modality Order for FileID $sorted_fileID[$order] was updated to $order \n "; | ||
| print "Message is: $message \n"; |
There was a problem hiding this comment.
get rid of the print statement here and keep it only for the LOGs
| my $modalityOrder_update = ${$this->{'dbhr'}}->prepare($query); | ||
| $modalityOrder_update->execute($order, $sorted_fileID[$order]); | ||
| $message = "The Modality Order for FileID $sorted_fileID[$order] was updated to $order \n "; | ||
| $this->{LOG}->print($message); |
|
@cmadjar re. the comment on populating existing data; I will need to generate a script. I am not sure this is doable through a simple mysql patch. |
|
Works like a charm :) |
Order the files with the same AcquisitionProtocolID (within a tarchiveID) by series_number.
aces/Loris#2221