X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/c32d70abc4f3cca4a8b3533d45b09d2a830d6a57..0e0945ef8465adaf1a195d729c4bdc9e8c37de60:/app/Http/Controllers/SearchController.php diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index c9ca1f09f..b65bca51e 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -1,32 +1,27 @@ -pageRepo = $pageRepo; - $this->bookRepo = $bookRepo; - $this->chapterRepo = $chapterRepo; + $this->entityRepo = $entityRepo; + $this->viewService = $viewService; + $this->searchService = $searchService; parent::__construct(); } @@ -36,19 +31,27 @@ class SearchController extends Controller * @return \Illuminate\View\View * @internal param string $searchTerm */ - public function searchAll(Request $request) + public function search(Request $request) { - if (!$request->has('term')) { - return redirect()->back(); - } $searchTerm = $request->get('term'); - $pages = $this->pageRepo->getBySearch($searchTerm); - $books = $this->bookRepo->getBySearch($searchTerm); - $chapters = $this->chapterRepo->getBySearch($searchTerm); - $this->setPageTitle('Search For ' . $searchTerm); - return view('search/all', ['pages' => $pages, 'books' => $books, 'chapters' => $chapters, 'searchTerm' => $searchTerm]); + $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm])); + + $page = $request->has('page') && is_int(intval($request->get('page'))) ? intval($request->get('page')) : 1; + $nextPageLink = baseUrl('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1)); + + $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20); + $hasNextPage = $this->searchService->searchEntities($searchTerm, 'all', $page+1, 20)['count'] > 0; + + return view('search/all', [ + 'entities' => $results['results'], + 'totalResults' => $results['total'], + 'searchTerm' => $searchTerm, + 'hasNextPage' => $hasNextPage, + 'nextPageLink' => $nextPageLink + ]); } + /** * Searches all entities within a book. * @param Request $request @@ -62,10 +65,44 @@ class SearchController extends Controller return redirect()->back(); } $searchTerm = $request->get('term'); - $whereTerm = [['book_id', '=', $bookId]]; - $pages = $this->pageRepo->getBySearch($searchTerm, $whereTerm); - $chapters = $this->chapterRepo->getBySearch($searchTerm, $whereTerm); + $searchWhereTerms = [['book_id', '=', $bookId]]; + $pages = $this->entityRepo->getBySearch('page', $searchTerm, $searchWhereTerms); + $chapters = $this->entityRepo->getBySearch('chapter', $searchTerm, $searchWhereTerms); return view('search/book', ['pages' => $pages, 'chapters' => $chapters, 'searchTerm' => $searchTerm]); } + + /** + * Search for a list of entities and return a partial HTML response of matching entities. + * Returns the most popular entities if no search is provided. + * @param Request $request + * @return mixed + */ + public function searchEntitiesAjax(Request $request) + { + $entities = collect(); + $entityTypes = $request->has('types') ? collect(explode(',', $request->get('types'))) : collect(['page', 'chapter', 'book']); + $searchTerm = ($request->has('term') && trim($request->get('term')) !== '') ? $request->get('term') : false; + + // Search for entities otherwise show most popular + if ($searchTerm !== false) { + foreach (['page', 'chapter', 'book'] as $entityType) { + if ($entityTypes->contains($entityType)) { + // TODO - Update to new system + $entities = $entities->merge($this->entityRepo->getBySearch($entityType, $searchTerm)->items()); + } + } + $entities = $entities->sortByDesc('title_relevance'); + } else { + $entityNames = $entityTypes->map(function ($type) { + return 'BookStack\\' . ucfirst($type); + })->toArray(); + $entities = $this->viewService->getPopular(20, 0, $entityNames); + } + + return view('search/entity-ajax-list', ['entities' => $entities]); + } + } + +