Merge pull request #3 from OsmosysSoftware/revert-1-issue-181

[bookstack] / app / Entity.php

diff --git a/app/Entity.php b/app/Entity.php
index 2c447814f4657da11151f3cc1daf8e842bcd7658..e5dd04bf28bdb01d30690c18e5b9a2b6986a7929 100644 (file)
--- a/app/Entity.php
+++ b/app/Entity.php
@@ -4,6 +4,8 @@
 class Entity extends Ownable
 {
 
 class Entity extends Ownable
 {
 

+    public $textField = 'description';
+

     /**
      * Compares this entity to another given entity.
      * Matches by comparing class and id.
     /**
      * Compares this entity to another given entity.
      * Matches by comparing class and id.


@@ -63,6 +65,15 @@ class Entity extends Ownable
         return $this->morphMany(Tag::class, 'entity')->orderBy('order', 'asc');
     }
 
         return $this->morphMany(Tag::class, 'entity')->orderBy('order', 'asc');
     }
 

+    /**
+     * Get the related search terms.
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function searchTerms()
+    {
+        return $this->morphMany(SearchTerm::class, 'entity');
+    }
+

     /**
      * Get this entities restrictions.
      */
     /**
      * Get this entities restrictions.
      */


@@ -83,17 +94,6 @@ class Entity extends Ownable
             ->where('action', '=', $action)->count() > 0;
     }
 
             ->where('action', '=', $action)->count() > 0;
     }
 

-    /**
-     * Check if this entity has live (active) restrictions in place.
-     * @param $role_id
-     * @param $action
-     * @return bool
-     */
-    public function hasActiveRestriction($role_id, $action)
-    {
-        return $this->getRawAttribute('restricted') && $this->hasRestriction($role_id, $action);
-    }
-

     /**
      * Get the entity jointPermissions this is connected to.
      * @return \Illuminate\Database\Eloquent\Relations\MorphMany
     /**
      * Get the entity jointPermissions this is connected to.
      * @return \Illuminate\Database\Eloquent\Relations\MorphMany


@@ -151,63 +151,25 @@ class Entity extends Ownable
     }
 
     /**
     }
 
     /**

-     * Perform a full-text search on this entity.
-     * @param string[] $fieldsToSearch
-     * @param string[] $terms
-     * @param string[] array $wheres
+     * Get the body text of this entity.

      * @return mixed
      */
      * @return mixed
      */

-    public function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
+    public function getText()

     {
     {

-        $exactTerms = [];
-        $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;
-            }
-        }
-        $isFuzzy = count($exactTerms) === 0 || count($fuzzyTerms) > 0;
-
-        // Perform fulltext search if relevant terms exist.
-        if ($isFuzzy) {
-            $termString = implode(' ', $fuzzyTerms);
-            $fields = implode(',', $fieldsToSearch);
-            $search = $search->selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$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);
-                    }
-                }
-            });
-        }
-        $orderBy = $isFuzzy ? 'title_relevance' : 'updated_at';
-
-        // Add additional where terms
-        foreach ($wheres as $whereTerm) {
-            $search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
-        }
+        return $this->{$this->textField};
+    }

 
 

-        // Load in relations
-        if ($this->isA('page')) {
-            $search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');
-        } else if ($this->isA('chapter')) {
-            $search = $search->with('book');
-        }
+    /**
+     * Return a generalised, common raw query that can be 'unioned' across entities.
+     * @return string
+     */
+    public function entityRawQuery(){return '';}

 
 

-        return $search->orderBy($orderBy, 'desc');
-    }
+    /**
+     * Get the url of this entity
+     * @param $path
+     * @return string
+     */
+    public function getUrl($path){return '/';}

 
 }
 
 }