X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/78564ec61dfe57ebb362eda21466ced6efaef276..refs/pull/448/head:/app/Entity.php diff --git a/app/Entity.php b/app/Entity.php index 5ea1d3876..e5dd04bf2 100644 --- a/app/Entity.php +++ b/app/Entity.php @@ -4,6 +4,8 @@ class Entity extends Ownable { + public $textField = 'description'; + /** * 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'); } + /** + * Get the related search terms. + * @return \Illuminate\Database\Eloquent\Relations\MorphMany + */ + public function searchTerms() + { + return $this->morphMany(SearchTerm::class, 'entity'); + } + /** * Get this entities restrictions. */ @@ -83,17 +94,6 @@ class Entity extends Ownable ->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 @@ -151,54 +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 */ - public static function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = []) + public function getText() { - $exactTerms = []; - foreach ($terms as $key => $term) { - $term = htmlentities($term, ENT_QUOTES); - $term = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $term); - if (preg_match('/\s/', $term)) { - $exactTerms[] = '%' . $term . '%'; - $term = '"' . $term . '"'; - } else { - $term = '' . $term . '*'; - } - if ($term !== '*') $terms[$key] = $term; - } - $termString = implode(' ', $terms); - $fields = implode(',', $fieldsToSearch); - $search = static::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); - } - } - }); - } + return $this->{$this->textField}; + } - // Add additional where terms - foreach ($wheres as $whereTerm) { - $search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]); - } - // Load in relations - if (static::isA('page')) { - $search = $search->with('book', 'chapter', 'createdBy', 'updatedBy'); - } else if (static::isA('chapter')) { - $search = $search->with('book'); - } + /** + * Return a generalised, common raw query that can be 'unioned' across entities. + * @return string + */ + public function entityRawQuery(){return '';} + + /** + * Get the url of this entity + * @param $path + * @return string + */ + public function getUrl($path){return '/';} - return $search->orderBy('title_relevance', 'desc'); - } - }