Towards CRM-20155 clean up form code in order to consolidate function…

[eileenmcnaughton]

… use.

Overview

This is code clean up on the merge form, preliminary to extensionising the code & implementing improvements in an iterative way according to the LeXIM approach

Before

civicrm/contact/dedupefind is accessible from Find & merge duplicate contacts & works

After

No change

Technical Details

The code in the Find and Merge Duplicate Contacts form has mystified me for along time. As a step towards extracting dedupe code into separate extension/s I have gone through & tidied up the finding of duplicates to re-use a function used elsewhere rather than duplicate it on the form.

The main changes in here are

1. $foundDupes = $this->get("dedupe_dupes_$gid"); routine is removed - I really could not see what purpose this serves @JKingsnorth @jmcclelland @deepak-srivastava maybe one of you can see a value in re-caching the dupes on the form (as well as in the prev_nextcache table) that I'm missing but my money is it is historical & preceeds the prevnext_cache mechanicsm
2. addition of defined $criteria as a placeholder. This is mostly because I plan to make this url-passable later & feel making it explicit is helpful here. In the url passable version it is possible to dedupe from search results.
3. I barely understand why we are setting $this->_cid, $this->_rgid, $this->_gid but to the extent it is useful setting at the start seems clearer than repeating it in if clauses
4. (this is the main one) calling

CRM_Dedupe_Merger::getDuplicatePairs($rgid, $gid, !$isConflictMode, 0, $isConflictMode, '', $isConflictMode, $criteria, TRUE);

has the same effect as calling the removed lines 145-150, 160-162, 167-169 and 186

Comments

@JKingsnorth @jmcclelland both of you have looked at this code fairly recently - would appreciate your insights.

[jmcclelland]

Thanks @eileenmcnaughton for doing the refactoring - I can't see any reason for the code you are getting rid of.