snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

remove filters, rename facet_filters to filter

Browse Source
This commit is contained in:
Marin Postma 2021-05-04 18:20:56 +02:00
parent 77740829bd
commit a717925caa
No known key found for this signature in database
GPG Key ID: D5241F0C0C865F30
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,9 +33,8 @@ pub struct SearchQuery {
pub attributes_to_crop: Option<HashSet<String>>, pub attributes_to_crop: Option<HashSet<String>>,
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 filters: Option<String>,
pub matches: Option<bool>, pub matches: Option<bool>,
pub facet_filters: Option<Value>, pub filter: Option<Value>,
pub facet_distributions: Option<Vec<String>>, pub facet_distributions: Option<Vec<String>>,
} }
@ -75,8 +74,8 @@ impl Index {
search.limit(query.limit); search.limit(query.limit);
search.offset(query.offset.unwrap_or_default()); search.offset(query.offset.unwrap_or_default());
if let Some(ref facets) = query.facet_filters { if let Some(ref filter) = query.filter {
if let Some(facets) = parse_facets(facets, self, &rtxn)? { if let Some(facets) = parse_facets(filter, self, &rtxn)? {
search.facet_condition(facets); search.facet_condition(facets);
} }
} }

8
meilisearch-http/src/routes/search.rs
View File

@ -24,9 +24,8 @@ pub struct SearchQueryGet {
attributes_to_crop: Option<String>, attributes_to_crop: Option<String>,
crop_length: Option<usize>, crop_length: Option<usize>,
attributes_to_highlight: Option<String>, attributes_to_highlight: Option<String>,
filters: Option<String>, filter: Option<String>,
matches: Option<bool>, matches: Option<bool>,
facet_filters: Option<String>,
facet_distributions: Option<String>, facet_distributions: Option<String>,
} }
@ -50,7 +49,7 @@ impl TryFrom<SearchQueryGet> for SearchQuery {
.facet_distributions .facet_distributions
.map(|attrs| attrs.split(',').map(String::from).collect::<Vec<_>>()); .map(|attrs| attrs.split(',').map(String::from).collect::<Vec<_>>());
let facet_filters = match other.facet_filters { let filter = match other.filter {
Some(ref f) => Some(serde_json::from_str(f)?), Some(ref f) => Some(serde_json::from_str(f)?),
None => None, None => None,
}; };
@ -63,9 +62,8 @@ impl TryFrom<SearchQueryGet> for SearchQuery {
attributes_to_crop, attributes_to_crop,
crop_length: other.crop_length, crop_length: other.crop_length,
attributes_to_highlight, attributes_to_highlight,
filters: other.filters, filter,
matches: other.matches, matches: other.matches,
facet_filters,
facet_distributions, facet_distributions,
}) })
} }