Amended search to not break on non-alpha-num chars

And also fixed exact term matches that contain non-alpha-num chars
Fixes #212

diff --git a/app/Entity.php b/app/Entity.php
index 496d20a333fa1069cd7c1ac19491df94b3f82b29..2c447814f4657da11151f3cc1daf8e842bcd7658 100644 (file)
--- a/app/Entity.php
+++ b/app/Entity.php
@@ -160,44 +160,46 @@ class Entity extends Ownable
     public function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
     {
         $exactTerms = [];
     public function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
     {
         $exactTerms = [];

-        if (count($terms) === 0) {
-            $search = $this;
-            $orderBy = 'updated_at';
-        } else {
-            foreach ($terms as $key => $term) {
-                $term = htmlentities($term, ENT_QUOTES);
-                $term = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $term);
-                if (preg_match('/&quot;.*?&quot;/', $term)) {
-                    $term = str_replace('&quot;', '', $term);
-                    $exactTerms[] = '%' . $term . '%';
-                    $term = '"' . $term . '"';
-                } else {
-                    $term = '' . $term . '*';
-                }
-                if ($term !== '*') $terms[$key] = $term;
+        $fuzzyTerms = [];
+        $search = static::newQuery();
+        foreach ($terms as $key => $term) {
+            $safeTerm = htmlentities($term, ENT_QUOTES);
+            $safeTerm = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $safeTerm);
+            if (preg_match('/&quot;.*?&quot;/', $safeTerm) || is_numeric($safeTerm)) {
+                $safeTerm = preg_replace('/^"(.*?)"$/', '$1', $term);
+                $exactTerms[] = '%' . $safeTerm . '%';
+            } else {
+                $safeTerm = '' . $safeTerm . '*';
+                if (trim($safeTerm) !== '*') $fuzzyTerms[] = $safeTerm;

             }
             }

-            $termString = implode(' ', $terms);
+        }
+        $isFuzzy = count($exactTerms) === 0 || count($fuzzyTerms) > 0;
+
+        // Perform fulltext search if relevant terms exist.
+        if ($isFuzzy) {
+            $termString = implode(' ', $fuzzyTerms);

             $fields = implode(',', $fieldsToSearch);
             $fields = implode(',', $fieldsToSearch);

-            $search = static::selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$termString]);
+            $search = $search->selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$termString]);

             $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
             $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);

+        }

 
 

-            // Ensure at least one exact term matches if in search
-            if (count($exactTerms) > 0) {
-                $search = $search->where(function ($query) use ($exactTerms, $fieldsToSearch) {
-                    foreach ($exactTerms as $exactTerm) {
-                        foreach ($fieldsToSearch as $field) {
-                            $query->orWhere($field, 'like', $exactTerm);
-                        }
+        // Ensure at least one exact term matches if in search
+        if (count($exactTerms) > 0) {
+            $search = $search->where(function ($query) use ($exactTerms, $fieldsToSearch) {
+                foreach ($exactTerms as $exactTerm) {
+                    foreach ($fieldsToSearch as $field) {
+                        $query->orWhere($field, 'like', $exactTerm);

                     }
                     }

-                });
-            }
-            $orderBy = 'title_relevance';
-        };
+                }
+            });
+        }
+        $orderBy = $isFuzzy ? 'title_relevance' : 'updated_at';

 
         // Add additional where terms
         foreach ($wheres as $whereTerm) {
             $search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
         }
 
         // Add additional where terms
         foreach ($wheres as $whereTerm) {
             $search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
         }

+

         // Load in relations
         if ($this->isA('page')) {
             $search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');
         // Load in relations
         if ($this->isA('page')) {
             $search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');