EZP-29984: Field LIKE & CONTAINS criterion not behaving like SQL Sear…

…ch Engine

Adapt SolrSE to correct support for LIKE and CONTAINS.

Todo:
- Open PR with API and integration test coverage for this.
- CS / Adapt unit tests

lib/Query/Common/CriterionVisitor/Field/FieldIn.php

@@ -5,8 +5,6 @@
  *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- *
- * @version //autogentag//
  */
 namespace EzSystems\EzPlatformSolrSearchEngine\Query\Common\CriterionVisitor\Field;
 
@@ -42,8 +40,8 @@ public function canVisit(Criterion $criterion)
      *
      * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target.
      *
-     * @param Criterion $criterion
-     * @param CriterionVisitor $subVisitor
+     * @param \eZ\Publish\API\Repository\Values\Content\Query\Criterion $criterion
+     * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor
      *
      * @return string
      */
@@ -63,14 +61,15 @@ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null)
 
         foreach ($searchFields as $name => $fieldType) {
             foreach ($criterion->value as $value) {
-                $preparedValue = $this->escapeQuote(
-                    $this->toString(
-                        $this->mapSearchFieldValue($value, $fieldType)
-                    ),
-                    true
-                );
+                $preparedValue = $this->toString($this->mapSearchFieldValue($value, $fieldType));
 
-                $queries[] = $name . ':"' . $preparedValue . '"';
+                if ($criterion->operator === Operator::CONTAINS) {
+                    $preparedValue = $this->escapeWildcard($preparedValue);
+                    $queries[] = $name . ':*' . $preparedValue . '*';
+                } else {
+                    $preparedValue = $this->escapeQuote($preparedValue, true);
+                    $queries[] = $name . ':"' . $preparedValue . '"';
+                }
             }
         }
 

lib/Query/Common/CriterionVisitor/Field/FieldLike.php

@@ -54,33 +54,20 @@ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null)
 
         $queries = [];
         foreach ($searchFields as $name => $fieldType) {
-            $preparedValue = $this->escape(
+            $preparedValue = $this->escapeWildcard(
                 $this->toString(
                     $this->mapSearchFieldValue($criterion->value, $fieldType)
                 )
             );
 
-            $queries[] = $name . ':*' . $preparedValue . '*';
+            if (strpos($preparedValue, '%') !== false) {
+                $queries[] = $name . ':' . str_replace('%', '*', $preparedValue);
+            } else {
+                // BC with previus Solr Engine usage, however this is how CONTAINS should work, not LIKE
+                $queries[] = $name . ':*' . $preparedValue . '*';
+            }
         }
 
         return '(' . implode(' OR ', $queries) . ')';
     }
-
-    /**
-     * Escapes value for use in wildcard search.
-     *
-     * @param $value
-     * @return mixed
-     */
-    private function escape($value)
-    {
-        $reservedCharacters = preg_quote('+-&|!(){}[]^"~*?:\\ ');
-
-        return preg_replace_callback(
-            '/([' . $reservedCharacters . '])/',
-            function ($matches) {
-                return '\\' . $matches[0];
-            },
-            $value);
-    }
 }

lib/Query/CriterionVisitor.php

@@ -132,4 +132,22 @@ protected function escapeQuote($string, $doubleQuote = false)
 
         return preg_replace($pattern, '\\\$1', $string);
     }
+
+    /**
+     * Escapes value for use in wildcard search.
+     *
+     * @param $value
+     * @return mixed
+     */
+    protected function escapeWildcard($value)
+    {
+        $reservedCharacters = preg_quote('+-&|!(){}[]^"~*?:\\ ');
+
+        return preg_replace_callback(
+            '/([' . $reservedCharacters . '])/',
+            function ($matches) {
+                return '\\' . $matches[0];
+            },
+            $value);
+    }
 }