web search done right
better snippets for phrase queries
Mikkel Denker0d51eff321e4
diff --git a/core/src/query/mod.rs b/core/src/query/mod.rsindex 80f26ef7..74e2bfa9 100644--- a/core/src/query/mod.rs+++ b/core/src/query/mod.rs@@ -77,13 +77,13 @@ impl Query {.collect();let simple_terms_text: Vec<String> = terms- .iter()- .filter_map(|term| {- if let Term::Simple(term) = term.as_ref() {- Some(term.clone())- } else {- None- }+ .clone()+ .into_iter()+ .flat_map(|term| {+ term.as_simple_text()+ .split_ascii_whitespace()+ .map(|s| s.to_string())+ .collect::<Vec<_>>()}).collect();@@ -309,6 +309,26 @@ mod tests {);}+ #[test]+ fn simple_terms_phrase() {+ let index = empty_index();+ let ctx = index.local_search_ctx();++ let terms = Query::parse(+ &ctx,+ &SearchQuery {+ query: "\"test term\"".to_string(),+ ..Default::default()+ },+ &index,+ )+ .expect("Failed to parse query")+ .simple_terms()+ .to_vec();++ assert_eq!(terms, vec!["test".to_string(), "term".to_string()]);+ }+#[test]fn not_query() {let mut index = Index::temporary().expect("Unable to open index");diff --git a/core/src/query/parser.rs b/core/src/query/parser.rsindex 9b554d3e..1a4ee3e4 100644--- a/core/src/query/parser.rs+++ b/core/src/query/parser.rs@@ -88,6 +88,19 @@ fn simple_into_tantivy(}impl Term {+ pub fn as_simple_text(&self) -> &str {+ match self {+ Term::Simple(term) => term,+ Term::Phrase(terms) => terms,+ Term::Not(term) => term.as_simple_text(),+ Term::Site(term) => term,+ Term::Title(term) => term,+ Term::Body(term) => term,+ Term::Url(term) => term,+ Term::PossibleBang(term) => term,+ }+ }+pub fn as_tantivy_query(&self,fields: &[(tantivy::schema::Field, &tantivy::schema::FieldEntry)],