<?php namespace BookStack\Http\Controllers;
-use BookStack\Services\ViewService;
+use BookStack\Actions\ViewService;
+use BookStack\Entities\Repos\EntityRepo;
+use BookStack\Entities\SearchService;
use Illuminate\Http\Request;
-use BookStack\Repos\BookRepo;
-use BookStack\Repos\ChapterRepo;
-use BookStack\Repos\PageRepo;
class SearchController extends Controller
{
- protected $pageRepo;
- protected $bookRepo;
- protected $chapterRepo;
+ protected $entityRepo;
protected $viewService;
+ protected $searchService;
/**
* SearchController constructor.
- * @param PageRepo $pageRepo
- * @param BookRepo $bookRepo
- * @param ChapterRepo $chapterRepo
+ * @param \BookStack\Entities\Repos\EntityRepo $entityRepo
* @param ViewService $viewService
+ * @param SearchService $searchService
*/
- public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, ViewService $viewService)
+ public function __construct(EntityRepo $entityRepo, ViewService $viewService, SearchService $searchService)
{
- $this->pageRepo = $pageRepo;
- $this->bookRepo = $bookRepo;
- $this->chapterRepo = $chapterRepo;
+ $this->entityRepo = $entityRepo;
$this->viewService = $viewService;
+ $this->searchService = $searchService;
parent::__construct();
}
* @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');
- $paginationAppends = $request->only('term');
- $pages = $this->pageRepo->getBySearch($searchTerm, [], 20, $paginationAppends);
- $books = $this->bookRepo->getBySearch($searchTerm, 10, $paginationAppends);
- $chapters = $this->chapterRepo->getBySearch($searchTerm, [], 10, $paginationAppends);
$this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));
- return view('search/all', [
- 'pages' => $pages,
- 'books' => $books,
- 'chapters' => $chapters,
- 'searchTerm' => $searchTerm
- ]);
- }
-
- /**
- * Search only the pages in the system.
- * @param Request $request
- * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
- */
- public function searchPages(Request $request)
- {
- if (!$request->has('term')) return redirect()->back();
- $searchTerm = $request->get('term');
- $paginationAppends = $request->only('term');
- $pages = $this->pageRepo->getBySearch($searchTerm, [], 20, $paginationAppends);
- $this->setPageTitle(trans('entities.search_page_for_term', ['term' => $searchTerm]));
- return view('search/entity-search-list', [
- 'entities' => $pages,
- 'title' => trans('entities.search_results_page'),
- 'searchTerm' => $searchTerm
- ]);
- }
+ $page = intval($request->get('page', '0')) ?: 1;
+ $nextPageLink = baseUrl('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));
- /**
- * Search only the chapters in the system.
- * @param Request $request
- * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
- */
- public function searchChapters(Request $request)
- {
- if (!$request->has('term')) return redirect()->back();
+ $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
- $searchTerm = $request->get('term');
- $paginationAppends = $request->only('term');
- $chapters = $this->chapterRepo->getBySearch($searchTerm, [], 20, $paginationAppends);
- $this->setPageTitle(trans('entities.search_chapter_for_term', ['term' => $searchTerm]));
- return view('search/entity-search-list', [
- 'entities' => $chapters,
- 'title' => trans('entities.search_results_chapter'),
- 'searchTerm' => $searchTerm
+ return view('search/all', [
+ 'entities' => $results['results'],
+ 'totalResults' => $results['total'],
+ 'searchTerm' => $searchTerm,
+ 'hasNextPage' => $results['has_more'],
+ 'nextPageLink' => $nextPageLink
]);
}
+
/**
- * Search only the books in the system.
+ * Searches all entities within a book.
* @param Request $request
- * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+ * @param integer $bookId
+ * @return \Illuminate\View\View
+ * @internal param string $searchTerm
*/
- public function searchBooks(Request $request)
+ public function searchBook(Request $request, $bookId)
{
- if (!$request->has('term')) return redirect()->back();
-
- $searchTerm = $request->get('term');
- $paginationAppends = $request->only('term');
- $books = $this->bookRepo->getBySearch($searchTerm, 20, $paginationAppends);
- $this->setPageTitle(trans('entities.search_book_for_term', ['term' => $searchTerm]));
- return view('search/entity-search-list', [
- 'entities' => $books,
- 'title' => trans('entities.search_results_book'),
- 'searchTerm' => $searchTerm
- ]);
+ $term = $request->get('term', '');
+ $results = $this->searchService->searchBook($bookId, $term);
+ return view('partials/entity-list', ['entities' => $results]);
}
/**
- * Searches all entities within a book.
+ * Searches all entities within a chapter.
* @param Request $request
- * @param integer $bookId
+ * @param integer $chapterId
* @return \Illuminate\View\View
* @internal param string $searchTerm
*/
- public function searchBook(Request $request, $bookId)
+ public function searchChapter(Request $request, $chapterId)
{
- if (!$request->has('term')) {
- return redirect()->back();
- }
- $searchTerm = $request->get('term');
- $searchWhereTerms = [['book_id', '=', $bookId]];
- $pages = $this->pageRepo->getBySearch($searchTerm, $searchWhereTerms);
- $chapters = $this->chapterRepo->getBySearch($searchTerm, $searchWhereTerms);
- return view('search/book', ['pages' => $pages, 'chapters' => $chapters, 'searchTerm' => $searchTerm]);
+ $term = $request->get('term', '');
+ $results = $this->searchService->searchChapter($chapterId, $term);
+ return view('partials/entity-list', ['entities' => $results]);
}
-
/**
* 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.
*/
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;
+ $entityTypes = $request->filled('types') ? collect(explode(',', $request->get('types'))) : collect(['page', 'chapter', 'book']);
+ $searchTerm = $request->get('term', false);
+ $permission = $request->get('permission', 'view');
// Search for entities otherwise show most popular
if ($searchTerm !== false) {
- if ($entityTypes->contains('page')) $entities = $entities->merge($this->pageRepo->getBySearch($searchTerm)->items());
- if ($entityTypes->contains('chapter')) $entities = $entities->merge($this->chapterRepo->getBySearch($searchTerm)->items());
- if ($entityTypes->contains('book')) $entities = $entities->merge($this->bookRepo->getBySearch($searchTerm)->items());
- $entities = $entities->sortByDesc('title_relevance');
+ $searchTerm .= ' {type:'. implode('|', $entityTypes->toArray()) .'}';
+ $entities = $this->searchService->searchEntities($searchTerm, 'all', 1, 20, $permission)['results'];
} else {
$entityNames = $entityTypes->map(function ($type) {
- return 'BookStack\\' . ucfirst($type);
+ return 'BookStack\\' . ucfirst($type); // TODO - Extract this elsewhere, too specific and stringy
})->toArray();
- $entities = $this->viewService->getPopular(20, 0, $entityNames);
+ $entities = $this->viewService->getPopular(20, 0, $entityNames, $permission);
}
return view('search/entity-ajax-list', ['entities' => $entities]);
}
-
}
-
-
projects / bookstack / blobdiff