From 009b4d8419d3d3fb72299e9f0f105499ab00f188 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Thu, 15 Mar 2018 10:42:53 -0100 Subject: provider is not moved around and send to platform Signed-off-by: Maxence Lange --- lib/Model/IndexDocument.php | 32 ++++++++++---------- lib/Model/SearchRequest.php | 72 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 16 deletions(-) (limited to 'lib/Model') diff --git a/lib/Model/IndexDocument.php b/lib/Model/IndexDocument.php index 099e193..4a1bc39 100644 --- a/lib/Model/IndexDocument.php +++ b/lib/Model/IndexDocument.php @@ -32,49 +32,51 @@ class IndexDocument implements \JsonSerializable { const ENCODED_BASE64 = 1; /** @var string|int */ - private $id; + public $id; /** @var string */ - private $providerId; + public $providerId; /** @var DocumentAccess */ - private $access; + public $access; /** @var Index */ - private $index; + public $index; /** @var int */ - private $modifiedTime = 0; + public $modifiedTime = 0; /** @var array */ - private $tags = []; + public $tags = []; + // TODO: do we really need it in the base class ? /** @var string */ - private $source; + public $source = ''; /** @var string */ - private $title; + public $title = ''; /** @var string */ - private $content = null; + public $content = null; /** @var string */ - private $link = ''; + public $link = ''; /** @var array */ - private $more = []; + public $more = []; /** @var array */ - private $excerpts = []; + public $excerpts = []; /** @var string */ - private $score; + public $score; /** @var array */ - private $info = []; + public $info = []; /** @var int */ - private $contentEncoded; + public $contentEncoded; + public function __construct($providerId, $id) { $this->providerId = $providerId; diff --git a/lib/Model/SearchRequest.php b/lib/Model/SearchRequest.php index 4c535eb..1abd184 100644 --- a/lib/Model/SearchRequest.php +++ b/lib/Model/SearchRequest.php @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . - * + * */ namespace OCA\FullTextSearch\Model; @@ -51,6 +51,11 @@ class SearchRequest implements \JsonSerializable { /** @var array */ private $options; + /** @var array */ + private $wildcardQueries = []; + + /** @var array */ + private $wildcardFilters = []; /** * SearchRequest constructor. @@ -196,6 +201,71 @@ class SearchRequest implements \JsonSerializable { } + /** + * @param array $query + * + * @return $this + */ + public function addWildcardQuery($query) { + $this->addWildcardQueries([$query]); + + return $this; + } + + /** + * @param array $query + * + * @return $this + */ + public function addWildcardQueries($query) { + array_push($this->wildcardQueries, $query); + + return $this; + } + + /** + * @return array + */ + public function getWildcardQueries() { + return $this->wildcardQueries; + } + + + + + /** + * @param array $filter + * + * @return $this + */ + public function addWildcardFilter($filter) { + $this->addWildcardfilters([$filter]); + + return $this; + } + + /** + * @param array $filters + * + * @return $this + */ + public function addWildcardFilters($filters) { + array_push($this->wildcardFilters, $filters); + + return $this; + } + + /** + * @return array + */ + public function getWildcardFilters() { + return $this->wildcardFilters; + } + + + + + /** * @return array */ -- cgit v1.2.3