Skip to content

web search done right

fix widgets case dependant

Mikkel Denkerf2bfe10fa555
diff --git a/core/src/searcher/api.rs b/core/src/searcher/api.rs
index 9320f6bc..ed8c8302 100644
--- a/core/src/searcher/api.rs
+++ b/core/src/searcher/api.rs
@@ -402,7 +402,21 @@ impl ApiSearcher {
return None;
}
- self.widgets.widget(query.query.as_str())
+ let parsed_terms = query::parser::parse(&query.query);
+
+ self.widgets.widget(
+ parsed_terms
+ .into_iter()
+ .filter_map(|term| {
+ if let query::parser::Term::Simple(simple) = *term {
+ Some(String::from(simple))
+ } else {
+ None
+ }
+ })
+ .join(" ")
+ .as_str(),
+ )
}
fn answer(&self, query: &str, webpages: &mut Vec<DisplayedWebpage>) -> Option<DisplayedAnswer> {
diff --git a/core/src/widgets/mod.rs b/core/src/widgets/mod.rs
index 325e0518..b40bdb7f 100644
--- a/core/src/widgets/mod.rs
+++ b/core/src/widgets/mod.rs
@@ -57,14 +57,16 @@ impl Widgets {
}
pub fn widget(&self, query: &str) -> Option<Widget> {
+ let query = query.to_lowercase();
+
self.calculator
- .try_calculate(query)
+ .try_calculate(&query)
.ok()
.map(Widget::Calculator)
.or_else(|| {
self.thesaurus
.as_ref()
- .and_then(|thesaurus| thesaurus.lookup(query))
+ .and_then(|thesaurus| thesaurus.lookup(&query))
.map(Widget::Thesaurus)
})
}