From 183ec3304dddbfa82f2128c0652ac8a81cd17c54 Mon Sep 17 00:00:00 2001 From: deepak-srivastava Date: Sat, 8 Aug 2015 01:41:12 +0100 Subject: [PATCH] comments --- CRM/Contact/Page/AJAX.php | 9 +++++++++ CRM/Contact/Page/DedupeMerge.php | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php index 5d248649ab..7b5ef9b6f6 100644 --- a/CRM/Contact/Page/AJAX.php +++ b/CRM/Contact/Page/AJAX.php @@ -668,6 +668,9 @@ LIMIT {$offset}, {$rowCount} CRM_Utils_JSON::output(array('status' => ($status) ? $oper : $status)); } + /** + * Retrieve list of duplicate pairs from cache table. + */ public static function getDedupes() { $offset = isset($_REQUEST['start']) ? CRM_Utils_Type::escape($_REQUEST['start'], 'Integer') : 0; $rowCount = isset($_REQUEST['length']) ? CRM_Utils_Type::escape($_REQUEST['length'], 'Integer') : 25; @@ -894,6 +897,9 @@ LIMIT {$offset}, {$rowCount} CRM_Utils_JSON::output($paperSize); } + /** + * Swap contacts in a dupe pair i.e main with duplicate contact. + */ public static function flipDupePairs($prevNextId = NULL) { if (!$prevNextId) { $prevNextId = $_REQUEST['pnid']; @@ -980,6 +986,9 @@ LIMIT {$offset}, {$rowCount} CRM_Utils_JSON::output($addressVal); } + /** + * Mark dupe pairs as selected from un-selected state or vice-versa, in dupe cache table. + */ public static function toggleDedupeSelect() { $rgid = CRM_Utils_Type::escape($_REQUEST['rgid'], 'Integer'); $gid = CRM_Utils_Type::escape($_REQUEST['gid'], 'Integer'); diff --git a/CRM/Contact/Page/DedupeMerge.php b/CRM/Contact/Page/DedupeMerge.php index da762dda6b..4e1f17b410 100644 --- a/CRM/Contact/Page/DedupeMerge.php +++ b/CRM/Contact/Page/DedupeMerge.php @@ -37,7 +37,7 @@ class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page { const BATCHLIMIT = 2; /** - * Browse all rule groups + * Browse batch merges. * * @return void * @access public @@ -56,6 +56,9 @@ class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page { return parent::run(); } + /** + * Build a queue of tasks by dividing dupe pairs in batches. + */ public static function getRunner() { $rgid = CRM_Utils_Request::retrieve('rgid', 'Positive', $this, FALSE, 0); $gid = CRM_Utils_Request::retrieve('gid', 'Positive', $this, FALSE, 0); @@ -124,7 +127,7 @@ class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page { } /** - * Collect Mailchimp data into temporary working table. + * Carry out batch merges. */ public static function callBatchMerge(CRM_Queue_TaskContext $ctx, $rgid, $gid = NULL, $mode = 'safe', $autoFlip = TRUE, $batchLimit = 1, $isSelected = 2) { $result = CRM_Dedupe_Merger::batchMerge($rgid, $gid, $mode, $autoFlip, $batchLimit, $isSelected); -- 2.25.1