searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-04 20:37:15 +02:00
Code Issues Releases Wiki Activity

smarter field_id name passing

Browse source
This commit is contained in:
mpostma 2020-05-12 12:19:44 +02:00
parent e5126af458
commit 347045adf2
4 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meilisearch-http/src/routes/search.rs
View file

@ -176,9 +176,13 @@ fn prepare_facet_list(facets: &str, schema: &Schema, facet_attrs: &[FieldId]) ->
Value::Array(vals) => {
let wildcard = Value::String("*".to_string());
if vals.iter().any(|f| f == &wildcard) {
return Ok(Vec::from(facet_attrs));
let attrs = facet_attrs
.iter()
.filter_map(|&id| schema.name(id).map(|n| (id, n.to_string())))
.collect();
return Ok(attrs);
}
let mut field_ids = Vec::new();
let mut field_ids = Vec::with_capacity(facet_attrs.len());
for facet in vals {
match facet {
Value::String(facet) => {
@ -186,7 +190,7 @@ fn prepare_facet_list(facets: &str, schema: &Schema, facet_attrs: &[FieldId]) ->
if !facet_attrs.contains(&id) {
return Err(ResponseError::FacetExpression("Only attributes set as facet can be counted".to_string())); // TODO make special error
}
field_ids.push(id);
field_ids.push((id, facet));
}
}
bad_val => return Err(ResponseError::FacetExpression(format!("expected String found {}", bad_val)))