Merge pull request #8757 from nextcloud/search_controller
Move search to proper Controllerpull/8765/head
Morris Jobke
GitHub
commit
f35c447525
@ -0,0 +1,53 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
/**
|
||||
* @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
|
||||
*
|
||||
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Core\Controller;
|
||||
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\JSONResponse;
|
||||
use OCP\IRequest;
|
||||
use OCP\ISearch;
|
||||
|
||||
class SearchController extends Controller {
|
||||
|
||||
/** @var ISearch */
|
||||
private $searcher;
|
||||
|
||||
public function __construct(string $appName,
|
||||
IRequest $request,
|
||||
ISearch $search) {
|
||||
parent::__construct($appName, $request);
|
||||
|
||||
$this->searcher = $search;
|
||||
}
|
||||
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
*/
|
||||
public function search(string $query, array $inApps = [], int $page = 1, int $size = 30): JSONResponse {
|
||||
$results = $this->searcher->searchPaged($query, $inApps, $page, $size);
|
||||
|
||||
return new JSONResponse($results);
|
||||
}
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
||||
*
|
||||
* @author Bart Visscher <bartv@thisnet.nl>
|
||||
* @author Jörn Friedrich Dreyer <jfd@butonic.de>
|
||||
* @author Lukas Reschke <lukas@statuscode.ch>
|
||||
* @author Morris Jobke <hey@morrisjobke.de>
|
||||
* @author Robin Appelman <robin@icewind.nl>
|
||||
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
||||
*
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
// Check if we are a user
|
||||
\OCP\JSON::checkLoggedIn();
|
||||
\OCP\JSON::callCheck();
|
||||
\OC::$server->getSession()->close();
|
||||
|
||||
if (isset($_GET['query'])) {
|
||||
$query = $_GET['query'];
|
||||
} else {
|
||||
$query = '';
|
||||
}
|
||||
if (isset($_GET['inApps'])) {
|
||||
$inApps = $_GET['inApps'];
|
||||
if (is_string($inApps)) {
|
||||
$inApps = array($inApps);
|
||||
}
|
||||
} else {
|
||||
$inApps = array();
|
||||
}
|
||||
if (isset($_GET['page'])) {
|
||||
$page = (int)$_GET['page'];
|
||||
} else {
|
||||
$page = 1;
|
||||
}
|
||||
if (isset($_GET['size'])) {
|
||||
$size = (int)$_GET['size'];
|
||||
} else {
|
||||
$size = 30;
|
||||
}
|
||||
if($query) {
|
||||
$result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size);
|
||||
OC_JSON::encodedPrint($result);
|
||||
}
|
||||
else {
|
||||
echo 'false';
|
||||
}
|
||||
Loading…
Reference in New Issue