snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 20:15:07 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Around to previous word

Browse Source
This commit is contained in:
Clémentine Urquizar 2021-06-04 02:25:38 +02:00
parent caaf8d3f40
commit 811bc2f421
No known key found for this signature in database
GPG Key ID: D8E7CC7422E77E1A
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meilisearch-http/src/index/search.rs
View File

@ -16,8 +16,12 @@ use super::Index;
pub type Document = IndexMap<String, Value>; pub type Document = IndexMap<String, Value>;
pub const DEFAULT_SEARCH_LIMIT: usize = 20; // pub const DEFAULT_CROP_LENGTH: usize = 5;
// const fn default_crop_length() -> Option<usize> {
// Some(DEFAULT_CROP_LENGTH)
// }
pub const DEFAULT_SEARCH_LIMIT: usize = 20;
const fn default_search_limit() -> usize { const fn default_search_limit() -> usize {
DEFAULT_SEARCH_LIMIT DEFAULT_SEARCH_LIMIT
} }
@ -31,6 +35,7 @@ pub struct SearchQuery {
pub limit: usize, pub limit: usize,
pub attributes_to_retrieve: Option<HashSet<String>>, pub attributes_to_retrieve: Option<HashSet<String>>,
pub attributes_to_crop: Option<HashSet<String>>, pub attributes_to_crop: Option<HashSet<String>>,
// #[serde(default = "default_crop_length")]
pub crop_length: Option<usize>, pub crop_length: Option<usize>,
pub attributes_to_highlight: Option<HashSet<String>>, pub attributes_to_highlight: Option<HashSet<String>>,
pub matches: Option<bool>, pub matches: Option<bool>,
@ -162,6 +167,7 @@ impl Index {
let to_crop = to_crop_ids let to_crop = to_crop_ids
.into_iter() .into_iter()
.map(|id| (id, query.crop_length)) .map(|id| (id, query.crop_length))
// .map(|id| (id, Some(5)))
.collect::<HashMap<_, _>>(); .collect::<HashMap<_, _>>();
for (_id, obkv) in self.documents(&rtxn, documents_ids)? { for (_id, obkv) in self.documents(&rtxn, documents_ids)? {
@ -346,7 +352,13 @@ impl<'a, A: AsRef<[u8]>> Formatter<'a, A> {
while let Some((word, token)) = tokens.next_if(|(_, token)| !matcher.matches(token.text())) { while let Some((word, token)) = tokens.next_if(|(_, token)| !matcher.matches(token.text())) {
buffer.push_back((word, token)); buffer.push_back((word, token));
taken_before += word.chars().count(); taken_before += word.chars().count();
while taken_before > crop_len { while taken_before >= crop_len {
// Around to the previous word
if let Some((word, _)) = buffer.front() {
if taken_before - word.chars().count() < crop_len {
break;
}
}
if let Some((word, _)) = buffer.pop_front() { if let Some((word, _)) = buffer.pop_front() {
taken_before -= word.chars().count(); taken_before -= word.chars().count();
} }
@ -358,13 +370,13 @@ impl<'a, A: AsRef<[u8]>> Formatter<'a, A> {
} }
let mut taken_after = 0; let mut taken_after = 0;
let after_iter = tokens let after_iter = tokens
.take_while(move |(word, _)| { .take_while(move |(word, _)| {
let take = taken_after <= crop_len; let take = taken_after < crop_len;
taken_after += word.chars().count(); taken_after += word.chars().count();
take take
}); });
let iter = buffer let iter = buffer
.into_iter() .into_iter()
.chain(after_iter); .chain(after_iter);