[CouchDB] Unset Testdate and ORDER BY SessionID #2812
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gluneau
added
the
Bug
driusan
reviewed
May 19, 2017
tools/CouchDB_MRI_Importer.php
Outdated
| @@ -102,7 +102,7 @@ function _generateCandidatesQuery($ScanTypes) | |||
| LEFT JOIN feedback_mri_comments fmric | |||
| ON (fmric.CommentTypeID=7 AND fmric.SessionID=s.ID) | |||
| WHERE c.Entity_type != 'Scanner' AND c.PSCID NOT LIKE '%9999' | |||
| AND c.Active='Y' AND s.Active='Y' AND c.CenterID <> 1"; | |||
| AND c.Active='Y' AND s.Active='Y' AND c.CenterID <> 1 ORDER BY s.ID"; | |||
There was a problem hiding this comment.
I don't think this is the right place to add an ORDER BY to fix the problem of document's fields being out of order. It's the query in getScanTypes() that is being inconsistent (as far as I can tell) which is causing it to generate different documents for the same data depending on MySQL's mood. The order in which sessions are processed is irrelevant.
|
I think this looks good now. @jstirling91 can you double check that it fixes the issue? |
jstirling91
approved these changes
Jun 5, 2017
taracampbell
pushed a commit
to taracampbell/Loris
that referenced
this pull request
Jun 13, 2017
The import scripts were adding data which was not in the datadictionary, such as the "Testdate" timestamp from instruments, and not providing an explicit ordering for scans. This resulted in unnecessary rebuilds when the data available to the user was semantically equivalent, but the encoded JSON was in a different order, or the timestamp was changed but no visible data was modified. This addresses both these issues.
jstirling91
pushed a commit
to jstirling91/Loris
that referenced
this pull request
Jun 21, 2017
The import scripts were adding data which was not in the datadictionary, such as the "Testdate" timestamp from instruments, and not providing an explicit ordering for scans. This resulted in unnecessary rebuilds when the data available to the user was semantically equivalent, but the encoded JSON was in a different order, or the timestamp was changed but no visible data was modified. This addresses both these issues.
driusan
pushed a commit
that referenced
this pull request
Oct 5, 2017
This updates the function signature of NDB_BVL_Instrument to fix PHP warnings introduced by #2812. Developers of instruments should update their own code accordingly, to ensure they don't generate their own errors about mismatched signature types.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removes Testdate that is not wanted to data querying