$action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE, 0);
$context = CRM_Utils_Request::retrieve('context', 'String', $this);
$limit = CRM_Utils_Request::retrieve('limit', 'Integer', $this);
+ $rgid = CRM_Utils_Request::retrieve('rgid', 'Positive');
+ $urlQry = "reset=1&rgid={$rgid}&gid={$gid}&limit={$limit}";
+ $this->assign('urlQuery', $urlQry);
$session = CRM_Core_Session::singleton();
$contactIds = $session->get('selectedSearchContactIds');
if ($action & CRM_Core_Action::RENEW) {
// empty cache
- $rgid = CRM_Utils_Request::retrieve('rgid', 'Positive', $this, FALSE, 0);
if ($rgid) {
CRM_Core_BAO_PrevNextCache::deleteItem(NULL, CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid));
}
- $urlQry = "reset=1&action=update&rgid={$rgid}";
- if ($gid) {
- $urlQry .= "&gid={$gid}";
- }
- CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contact/dedupefind', $urlQry));
+ CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contact/dedupefind', $urlQry . "&action=update"));
}
elseif ($action & CRM_Core_Action::MAP) {
// do a batch merge if requested
- $rgid = CRM_Utils_Request::retrieve('rgid', 'Positive', $this, FALSE, 0);
$result = CRM_Dedupe_Merger::batchMerge($rgid, $gid, 'safe', TRUE, 75);
$skippedCount = CRM_Utils_Request::retrieve('skipped', 'Positive', $this, FALSE, 0);
}
$message .= ts(" during the batch merge process with safe mode.");
CRM_Core_Session::setStatus($message, ts('Merge Complete'), 'success');
-
- $urlQry = "reset=1&action=update&rgid={$rgid}";
- if ($gid) {
- $urlQry .= "&gid={$gid}";
- }
- CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contact/dedupefind', $urlQry));
+ CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contact/dedupefind', $urlQry . "&action=update"));
}
else {
- $urlQry = "reset=1&action=map&rgid={$rgid}";
- if ($gid) {
- $urlQry .= "&gid={$gid}";
- }
- $urlQry .= "&skipped={$skippedCount}&merged={$mergedCount}";
+ $urlQry .= "&action=map&skipped={$skippedCount}&merged={$mergedCount}";
CRM_Utils_System::jsRedirect(
CRM_Utils_System::url('civicrm/contact/dedupefind', $urlQry),
ts('Batch Merge Task in progress'),
$action & CRM_Core_Action::BROWSE
) {
$cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this, FALSE, 0);
- $rgid = CRM_Utils_Request::retrieve('rgid', 'Positive', $this, FALSE, 0);
$this->action = CRM_Core_Action::UPDATE;
- $sourceParams = 'snippet=4';
- if ($gid) {
- $sourceParams .= "&gid={$gid}";
- }
- if ($rgid) {
- $sourceParams .= "&rgid={$rgid}";
- }
+ $urlQry .= '&snippet=4';
if ($context == 'conflicts') {
- $sourceParams .= "&selected=1";
+ $urlQry .= "&selected=1";
}
- $this->assign('sourceUrl', CRM_Utils_System::url('civicrm/ajax/dedupefind', $sourceParams, FALSE, NULL, FALSE));
+ $this->assign('sourceUrl', CRM_Utils_System::url('civicrm/ajax/dedupefind', $urlQry, FALSE, NULL, FALSE));
//reload from cache table
$cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid);
if (empty($this->_mainContacts)) {
if ($context == 'conflicts') {
// if the current screen was intended to list only selected contacts, move back to full dupe list
- $sourceParams = 'reset=1&action=update';
- if ($gid) {
- $sourceParams .= "&gid={$gid}";
- }
- if ($rgid) {
- $sourceParams .= "&rgid={$rgid}";
- }
- CRM_Utils_System::redirect(CRM_Utils_System::url(CRM_Utils_System::currentPath(), $sourceParams));
+ CRM_Utils_System::redirect(CRM_Utils_System::url(CRM_Utils_System::currentPath(), $urlQry . '&action=update'));
}
if ($gid) {
$foundDupes = $this->get("dedupe_dupes_$gid");
CRM_Utils_System::redirect($url);
}
else {
- $cids = array();
- foreach ($foundDupes as $dupe) {
- $cids[$dupe[0]] = 1;
- $cids[$dupe[1]] = 1;
- }
- $cidString = implode(', ', array_keys($cids));
- $sql = "SELECT id, display_name FROM civicrm_contact WHERE id IN ($cidString) ORDER BY sort_name";
- $dao = new CRM_Core_DAO();
- $dao->query($sql);
- $displayNames = array();
- while ($dao->fetch()) {
- $displayNames[$dao->id] = $dao->display_name;
- }
-
- // FIXME: sort the contacts; $displayName
- // is already sort_name-sorted, so use that
- // (also, consider sorting by dupe count first)
- // lobo - change the sort to by threshold value
- // so the more likely dupes are sorted first
- $userId = CRM_Core_Session::singleton()->getLoggedInContactID();
- $mainContacts = $permission = array();
+ $mainContacts = CRM_Dedupe_Finder::parseAndStoreDupePairs($foundDupes, $cacheKeyString);
- foreach ($foundDupes as $dupes) {
- $srcID = $dupes[0];
- $dstID = $dupes[1];
- if ($dstID == $userId) {
- $srcID = $dupes[1];
- $dstID = $dupes[0];
- }
-
- /***
- * Eliminate this since it introduces 3 queries PER merge row
- * and hence is very expensive
- * CRM-8822
- * if ( !array_key_exists( $srcID, $permission ) ) {
- * $permission[$srcID] = CRM_Contact_BAO_Contact_Permission::allow( $srcID, CRM_Core_Permission::EDIT );
- * }
- * if ( !array_key_exists( $dstID, $permission ) ) {
- * $permission[$dstID] = CRM_Contact_BAO_Contact_Permission::allow( $dstID, CRM_Core_Permission::EDIT );
- * }
- *
- * $canMerge = ( $permission[$dstID] && $permission[$srcID] );
- *
- */
-
- // we'll do permission checking during the merge process
- $canMerge = TRUE;
-
- $mainContacts[] = $row = array(
- 'srcID' => $srcID,
- 'srcName' => $displayNames[$srcID],
- 'dstID' => $dstID,
- 'dstName' => $displayNames[$dstID],
- 'weight' => $dupes[2],
- 'canMerge' => $canMerge,
- );
-
- $data = CRM_Core_DAO::escapeString(serialize($row));
- $values[] = " ( 'civicrm_contact', $srcID, $dstID, '$cacheKeyString', '$data' ) ";
- }
if ($cid) {
$this->_cid = $cid;
}
$this->_rgid = $rgid;
$this->_mainContacts = $mainContacts;
- CRM_Core_BAO_PrevNextCache::setItem($values);
$session = CRM_Core_Session::singleton();
if ($this->_cid) {
$session->pushUserContext(CRM_Utils_System::url('civicrm/contact/deduperules',
- "action=update&rgid={$this->_rgid}&gid={$this->_gid}&cid={$this->_cid}"
+ $urlQry . "&action=update&cid={$this->_cid}"
));
}
else {
$session->pushUserContext(CRM_Utils_System::url('civicrm/contact/dedupefind',
- "reset=1&action=update&rgid={$this->_rgid}"
+ $urlQry . "&action=update"
));
}
}
projects / civicrm-core.git / blobdiff