CRM-16575 fix - Searching/reporting on similar values in multi select fields breaks

https://issues.civicrm.org/jira/browse/CRM-16575

diff --git a/CRM/Contact/Form/Search/Builder.php b/CRM/Contact/Form/Search/Builder.php
index 142281ac0dc960a6ca1c6fa3b94c4bb1f65a2433..e6ac900f7bfcf123d6b7ccbd9cc57814a8e3d565 100644 (file)
--- a/CRM/Contact/Form/Search/Builder.php
+++ b/CRM/Contact/Form/Search/Builder.php
@@ -393,7 +393,6 @@ class CRM_Contact_Form_Search_Builder extends CRM_Contact_Form_Search {
     else {
       $this->_sortByCharacter = NULL;
     }
-
     $this->_params = $this->convertFormValues($this->_formValues);
     $this->_returnProperties = &$this->returnProperties();
 

diff --git a/CRM/Core/BAO/CustomQuery.php b/CRM/Core/BAO/CustomQuery.php
index c6b8518a95f432e19e2219d31a2847d32ba19b60..e1a7ac64eb4febd640c1414e5018c63ed18304c4 100644 (file)
--- a/CRM/Core/BAO/CustomQuery.php
+++ b/CRM/Core/BAO/CustomQuery.php
@@ -383,6 +383,7 @@ SELECT label, value
         }
 
         $qillValue = CRM_Core_BAO_CustomField::getDisplayValue($value, $id, $this->_options);
+        $qillOp = CRM_Utils_Array::value($op, CRM_Core_SelectValues::getSearchBuilderOperators(), $op);
 
         switch ($field['data_type']) {
           case 'String':
@@ -400,6 +401,7 @@ SELECT label, value
             else {
               $val = CRM_Utils_Type::escape($strtolower(trim($value)), 'String');
 
+              // CRM-14563,CRM-16575 : Special handling of multi-select custom fields
               $specialHTMLType = array(
                 'CheckBox',
                 'Multi-Select',
@@ -407,27 +409,30 @@ SELECT label, value
                 'Multi-Select State/Province',
                 'Multi-Select Country',
               );
-
-              if (in_array($field['html_type'], $specialHTMLType)) {
-                $val = "[[:cntrl:]]" . $val . "[[:cntrl:]]";
-                $op  = 'RLIKE';
-
-              }
-              elseif ($wildcard) {
-                $val = "[[:cntrl:]]%$val%[[:cntrl:]]";
-                $op = 'LIKE';
+              if (!empty($val)) {
+                if (in_array($field['html_type'], $specialHTMLType)) {
+                  if (strstr($op, 'IN')) {
+                    $val = str_replace(array('(', ')'), '', str_replace(",", "[[:cntrl:]]|[[:cntrl:]]", $val));
+                  }
+                  $op = (strstr($op, '!') || strstr($op, 'NOT')) ? 'NOT RLIKE' : 'RLIKE';
+                  $val = "[[:cntrl:]]" . $val . "[[:cntrl:]]";
+                }
+                elseif ($wildcard) {
+                  $val = "[[:cntrl:]]%$val%[[:cntrl:]]";
+                  $op = 'LIKE';
+                }
               }
 
               //FIX for custom data query fired against no value(NULL/NOT NULL)
               $this->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause($sql, $op, $val, $field['data_type']);
-              $this->_qill[$grouping][] = "$field[label] $op $qillValue";
+              $this->_qill[$grouping][] = "$field[label] $qillOp $qillValue";
             }
             break;
 
           case 'ContactReference':
             $label = $value ? CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $value, 'sort_name') : '';
             $this->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause($fieldName, $op, $value, 'String');
-            $this->_qill[$grouping][] = $field['label'] . " $op $label";
+            $this->_qill[$grouping][] = $field['label'] . " $qillOp $label";
             break;
 
           case 'Int':
@@ -436,7 +441,7 @@ SELECT label, value
             }
             else {
               $this->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause($fieldName, $op, $value, 'Integer');
-              $this->_qill[$grouping][] = $field['label'] . " $op $value";
+              $this->_qill[$grouping][] = $field['label'] . " $qillOp $value";
             }
             break;
 
@@ -450,12 +455,12 @@ SELECT label, value
             $value = ($value == 1) ? 1 : 0;
             $this->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause($fieldName, $op, $value, 'Integer');
             $value = $value ? ts('Yes') : ts('No');
-            $this->_qill[$grouping][] = $field['label'] . " {$op} {$value}";
+            $this->_qill[$grouping][] = $field['label'] . " $qillOp {$value}";
             break;
 
           case 'Link':
             $this->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause($fieldName, $op, $value, 'String');
-            $this->_qill[$grouping][] = $field['label'] . " $op $value";
+            $this->_qill[$grouping][] = $field['label'] . " $qillOp $value";
             break;
 
           case 'Float':
@@ -464,7 +469,7 @@ SELECT label, value
             }
             else {
               $this->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause($fieldName, $op, $value, 'Float');
-              $this->_qill[$grouping][] = $field['label'] . " {$op} {$value}";
+              $this->_qill[$grouping][] = $field['label'] . " $qillOp {$value}";
             }
             break;
 
@@ -480,13 +485,13 @@ SELECT label, value
               $moneyFormat = CRM_Utils_Rule::cleanMoney($value);
               $value = $moneyFormat;
               $this->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause($fieldName, $op, $value, 'Float');
-              $this->_qill[$grouping][] = $field['label'] . " {$op} {$value}";
+              $this->_qill[$grouping][] = $field['label'] . " {$qillOp} {$value}";
             }
             break;
 
           case 'Memo':
             $this->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause($fieldName, $op, $value, 'String');
-            $this->_qill[$grouping][] = "$field[label] $op $value";
+            $this->_qill[$grouping][] = "$field[label] $qillOp $value";
             break;
 
           case 'Date':
@@ -505,7 +510,7 @@ SELECT label, value
 
               $date = CRM_Utils_Date::processDate($value);
               $this->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause($fieldName, $op, $date, 'String');
-              $this->_qill[$grouping][] = $field['label'] . " {$op} " . CRM_Utils_Date::customFormat($date);
+              $this->_qill[$grouping][] = $field['label'] . " {$qillOp} " . CRM_Utils_Date::customFormat($date);
             }
             else {
               if (is_numeric($fromValue) && strlen($fromValue) == 4) {
@@ -536,7 +541,7 @@ SELECT label, value
           case 'StateProvince':
           case 'Country':
             $this->_where[$grouping][] = "$fieldName {$op} " . CRM_Utils_Type::escape($value, 'Int');
-            $this->_qill[$grouping][] = $field['label'] . " {$op} {$qillValue}";
+            $this->_qill[$grouping][] = $field['label'] . " {$qillOp} {$qillValue}";
             break;
 
           case 'File':
@@ -551,7 +556,7 @@ SELECT label, value
                   break;
               }
               $this->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause($fieldName, $op);
-              $this->_qill[$grouping][] = $field['label'] . " {$op} ";
+              $this->_qill[$grouping][] = $field['label'] . " {$qillOp} ";
             }
             break;
         }

diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php
index 6168e8a8c0d071b2aac2b0bdcb837458f4e32e56..8ee8a48a59c51d80569b991c81946486f444dc37 100644 (file)
--- a/CRM/Core/BAO/Mapping.php
+++ b/CRM/Core/BAO/Mapping.php
@@ -1042,32 +1042,8 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
             }
           }
 
-          // CRM-14563: we store checkbox, multi-select and adv-multi select custom field using separator, hence it
-          // needs special handling.
-          if ($cfID = CRM_Core_BAO_CustomField::getKeyID(CRM_Utils_Array::value(1, $v))) {
-            $isCustomField = TRUE;
-            $customFieldType = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField', $cfID, 'html_type');
-            $specialHTMLType = array(
-              'CheckBox',
-              'Multi-Select',
-              'AdvMulti-Select',
-              'Multi-Select State/Province',
-              'Multi-Select Country',
-            );
-
-            // override the operator to handle separator ( note: this might have some performance issues )
-            if (in_array($customFieldType, $specialHTMLType)) {
-              // FIX ME: != and few other operators are not handled
-              $specialOperators = array('=', 'IN', 'LIKE');
-
-              if (in_array($params['operator'][$key][$k], $specialOperators)) {
-                $params['operator'][$key][$k] = 'RLIKE';
-              }
-            }
-          }
-
           // CRM-14983: verify if values are comma separated convert to array
-          if (!is_array($value) && (strpos($value, ',') !== FALSE || strstr($value, '(')) && empty($isCustomField) && $params['operator'][$key][$k] == 'IN') {
+          if (!is_array($value) && (strpos($value, ',') !== FALSE || strstr($value, '(')) && substr($fldName, 0, 7) != 'custom_' && $params['operator'][$key][$k] == 'IN') {
             preg_match('#\((.*?)\)#', $value, $match);
             $tmpArray = explode(',', $match[1]);
             $value = array_combine(array_values($tmpArray), array_values($tmpArray));