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

Merge #221

Browse Source 
221: fix get search crop len r=irevoire a=MarinPostma

Fix bug where crop length was mandatory when performing a GET search.


Co-authored-by: marin postma <postma.marin@protonmail.com>
This commit is contained in:
bors[bot] 2021-06-22 14:13:52 +00:00 committed by GitHub
commit d1ad23e2d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meilisearch-http/src/index/mod.rs
View File

@ -13,7 +13,7 @@ use serde_json::{Map, Value};
use crate::helpers::EnvSizer; use crate::helpers::EnvSizer;
use error::Result; use error::Result;
pub use search::{SearchQuery, SearchResult, DEFAULT_SEARCH_LIMIT}; pub use search::{SearchQuery, SearchResult, DEFAULT_SEARCH_LIMIT, default_crop_length};
pub use updates::{Checked, Facets, Settings, Unchecked}; pub use updates::{Checked, Facets, Settings, Unchecked};
use self::error::IndexError; use self::error::IndexError;

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

@ -23,7 +23,7 @@ const fn default_search_limit() -> usize {
} }
pub const DEFAULT_CROP_LENGTH: usize = 200; pub const DEFAULT_CROP_LENGTH: usize = 200;
const fn default_crop_length() -> usize { pub const fn default_crop_length() -> usize {
DEFAULT_CROP_LENGTH DEFAULT_CROP_LENGTH
} }

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

@ -6,7 +6,7 @@ use serde_json::Value;
use crate::error::ResponseError; use crate::error::ResponseError;
use crate::helpers::Authentication; use crate::helpers::Authentication;
use crate::index::{SearchQuery, DEFAULT_SEARCH_LIMIT}; use crate::index::{SearchQuery, default_crop_length, DEFAULT_SEARCH_LIMIT};
use crate::routes::IndexParam; use crate::routes::IndexParam;
use crate::Data; use crate::Data;
@ -22,10 +22,12 @@ pub struct SearchQueryGet {
limit: Option<usize>, limit: Option<usize>,
attributes_to_retrieve: Option<String>, attributes_to_retrieve: Option<String>,
attributes_to_crop: Option<String>, attributes_to_crop: Option<String>,
#[serde(default = "default_crop_length")]
crop_length: usize, crop_length: usize,
attributes_to_highlight: Option<String>, attributes_to_highlight: Option<String>,
filter: Option<String>, filter: Option<String>,
matches: Option<bool>, #[serde(default = "Default::default")]
matches: bool,
facet_distributions: Option<String>, facet_distributions: Option<String>,
} }
@ -64,7 +66,7 @@ impl From<SearchQueryGet> for SearchQuery {
crop_length: other.crop_length, crop_length: other.crop_length,
attributes_to_highlight, attributes_to_highlight,
filter, filter,
matches: other.matches, matches: Some(other.matches),
facet_distributions, facet_distributions,
} }
} }