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.

Sign up for GitHub

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

Jump to bottom

Fix for Merge Duplicates Failing when no Determinations need Downgrading #1484

Merged
merged 6 commits into from
Jul 29, 2024
Merged

Fix for Merge Duplicates Failing when no Determinations need Downgrading #1484

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2644980
add conditional check for if there are any determinations to downgrad…
MuchQuak Jul 9, 2024
3f9e7f9
updating local branch with dev
MuchQuak Jul 15, 2024
da96a3a
adds copies of some functions from occurrenceEditorDeterminations to …
MuchQuak Jul 16, 2024
2bbb3da
removing dead code comments
MuchQuak Jul 16, 2024
bdf0c6e
fix determination merging priority to favor the lasting record
MuchQuak Jul 26, 2024
2d8ed20
adds temp function to transfer attributes over to omoccuridentifers i…
MuchQuak Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions classes/OccurrenceEditorManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1589,15 +1589,16 @@ public function mergeRecords($targetOccid,$sourceOccid){
]);

//Downgrade old determinations if new determinations have a current determination
$parameters = str_repeat('?,', count($currentDeterminations) - 1) . '?';
$sql = <<<"SQL"
UPDATE omoccurdeterminations
JOIN (SELECT count(*) as cnt FROM omoccurdeterminations WHERE isCurrent = 1 AND occid = ? AND detid NOT IN ($parameters)) as update_flag on cnt > 0
SET isCurrent = 0
WHERE occid = ? AND isCurrent = 1 AND detid IN ($parameters);
SQL;
$this->conn->execute_query($sql, array_merge([$targetOccid], $currentDeterminations, [$targetOccid], $currentDeterminations));

if(count($currentDeterminations) > 0) {
$parameters = str_repeat('?,', count($currentDeterminations) - 1) . '?';
$sql = <<<"SQL"
UPDATE omoccurdeterminations
JOIN (SELECT count(*) as cnt FROM omoccurdeterminations WHERE isCurrent = 1 AND occid = ? AND detid NOT IN ($parameters)) as update_flag on cnt > 0
SET isCurrent = 0
WHERE occid = ? AND isCurrent = 1 AND detid IN ($parameters);
SQL;
$this->conn->execute_query($sql, array_merge([$targetOccid], $currentDeterminations, [$targetOccid], $currentDeterminations));
}
//Remap images
$sql = <<<'SQL'
UPDATE images SET occid = ? WHERE occid = ?;
Expand Down