snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 02:27:40 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Refacto

Browse Source
This commit is contained in:
Clémentine Urquizar 2021-06-15 18:44:56 +02:00
parent 1ef061d92b
commit 9840b5c7fb
No known key found for this signature in database
GPG Key ID: D8E7CC7422E77E1A
1 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,9 +235,8 @@ fn parse_formatted_options(
};
if attr == "*" {
let ids = displayed_ids.clone();
for id in ids {
formatted_options.insert(id, new_format);
for id in displayed_ids {
formatted_options.insert(*id, new_format);
}
break;
}
@ -245,43 +244,40 @@ fn parse_formatted_options(
if let Some(id) = fields_ids_map.id(&attr) {
formatted_options.insert(id, new_format);
}
};
}
for attr in attr_to_crop {
let mut attr_name = attr.clone();
let mut attr_len = Some(query_crop_length);
let mut attr_len = query_crop_length;
if attr_name.contains(':') {
let mut split = attr_name.rsplit(':');
attr_len = match split.next() {
Some(s) => s.parse::<usize>().ok(),
None => None,
let mut split = attr_name.rsplitn(2, ':');
attr_name = match split.next().zip(split.next()) {
Some((len, name)) => {
attr_len = len.parse().unwrap_or(query_crop_length);
name.to_string()
},
None => attr_name,
};
attr_name = split.flat_map(|s| s.chars()).collect();
}
if attr_name == "*" {
let ids = displayed_ids.clone();
for id in ids {
let mut highlight = false;
if let Some(f) = formatted_options.get(&id) {
highlight = f.highlight;
}
formatted_options.insert(id, FormatOptions {
highlight,
crop: attr_len,
for id in displayed_ids {
formatted_options
.entry(*id)
.and_modify(|f| f.crop = Some(attr_len))
.or_insert(FormatOptions {
highlight: false,
crop: Some(attr_len),
});
}
}
if let Some(id) = fields_ids_map.id(&attr_name) {
let mut highlight = false;
if let Some(f) = formatted_options.get(&id) {
highlight = f.highlight;
}
formatted_options.insert(id, FormatOptions {
highlight,
crop: attr_len,
formatted_options
.entry(id)
.and_modify(|f| f.crop = Some(attr_len))
.or_insert(FormatOptions {
highlight: false,
crop: Some(attr_len),
});
}
}