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

Rename highlighter variable into formatter

Browse Source
This commit is contained in:
Clémentine Urquizar 2021-06-13 12:29:24 +02:00
parent 7f84f59472
commit 638009fb2b
No known key found for this signature in database
GPG Key ID: D8E7CC7422E77E1A
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,7 +194,7 @@ impl Index {
}; };
let stop_words = fst::Set::default(); let stop_words = fst::Set::default();
let highlighter = let formatter =
Formatter::new(&stop_words, (String::from("<em>"), String::from("</em>"))); Formatter::new(&stop_words, (String::from("<em>"), String::from("</em>")));
for (_id, obkv) in self.documents(&rtxn, documents_ids)? { for (_id, obkv) in self.documents(&rtxn, documents_ids)? {
@ -202,7 +202,7 @@ impl Index {
let formatted = compute_formatted( let formatted = compute_formatted(
&fields_ids_map, &fields_ids_map,
obkv, obkv,
&highlighter, &formatter,
&matching_words, &matching_words,
all_formatted.as_ref().as_slice(), all_formatted.as_ref().as_slice(),
&to_highlight_ids, &to_highlight_ids,
@ -268,7 +268,7 @@ fn make_document(
fn compute_formatted<A: AsRef<[u8]>>( fn compute_formatted<A: AsRef<[u8]>>(
field_ids_map: &FieldsIdsMap, field_ids_map: &FieldsIdsMap,
obkv: obkv::KvReader, obkv: obkv::KvReader,
highlighter: &Formatter<A>, formatter: &Formatter<A>,
matching_words: &impl Matcher, matching_words: &impl Matcher,
all_formatted: &[FieldId], all_formatted: &[FieldId],
to_highlight_fields: &HashSet<FieldId>, to_highlight_fields: &HashSet<FieldId>,
@ -280,7 +280,7 @@ fn compute_formatted<A: AsRef<[u8]>>(
if let Some(value) = obkv.get(*field) { if let Some(value) = obkv.get(*field) {
let mut value: Value = serde_json::from_slice(value)?; let mut value: Value = serde_json::from_slice(value)?;
value = highlighter.format_value( value = formatter.format_value(
value, value,
matching_words, matching_words,
to_crop_fields.get(field).copied().flatten(), to_crop_fields.get(field).copied().flatten(),
@ -301,7 +301,7 @@ fn compute_formatted<A: AsRef<[u8]>>(
Ok(document) Ok(document)
} }
/// trait to allow unit testing of `compute_formated` /// trait to allow unit testing of `compute_formatted`
trait Matcher { trait Matcher {
fn matches(&self, w: &str) -> bool; fn matches(&self, w: &str) -> bool;
} }
@ -480,7 +480,7 @@ mod test {
#[test] #[test]
fn no_formatted() { fn no_formatted() {
let stop_words = fst::Set::default(); let stop_words = fst::Set::default();
let highlighter = let formatter =
Formatter::new(&stop_words, (String::from("<em>"), String::from("</em>"))); Formatter::new(&stop_words, (String::from("<em>"), String::from("</em>")));
let mut fields = FieldsIdsMap::new(); let mut fields = FieldsIdsMap::new();
@ -503,7 +503,7 @@ mod test {
let value = compute_formatted( let value = compute_formatted(
&fields, &fields,
obkv, obkv,
&highlighter, &formatter,
&matching_words, &matching_words,
&all_formatted, &all_formatted,
&to_highlight_ids, &to_highlight_ids,
@ -517,7 +517,7 @@ mod test {
#[test] #[test]
fn formatted_no_highlight() { fn formatted_no_highlight() {
let stop_words = fst::Set::default(); let stop_words = fst::Set::default();
let highlighter = let formatter =
Formatter::new(&stop_words, (String::from("<em>"), String::from("</em>"))); Formatter::new(&stop_words, (String::from("<em>"), String::from("</em>")));
let mut fields = FieldsIdsMap::new(); let mut fields = FieldsIdsMap::new();
@ -540,7 +540,7 @@ mod test {
let value = compute_formatted( let value = compute_formatted(
&fields, &fields,
obkv, obkv,
&highlighter, &formatter,
&matching_words, &matching_words,
&all_formatted, &all_formatted,
&to_highlight_ids, &to_highlight_ids,
@ -554,7 +554,7 @@ mod test {
#[test] #[test]
fn formatted_with_highlight() { fn formatted_with_highlight() {
let stop_words = fst::Set::default(); let stop_words = fst::Set::default();
let highlighter = let formatter =
Formatter::new(&stop_words, (String::from("<em>"), String::from("</em>"))); Formatter::new(&stop_words, (String::from("<em>"), String::from("</em>")));
let mut fields = FieldsIdsMap::new(); let mut fields = FieldsIdsMap::new();
@ -577,7 +577,7 @@ mod test {
let value = compute_formatted( let value = compute_formatted(
&fields, &fields,
obkv, obkv,
&highlighter, &formatter,
&matching_words, &matching_words,
&all_formatted, &all_formatted,
&to_highlight_ids, &to_highlight_ids,