web search done right
move empty query handling into the searcher and handle error gracefully
Mikkel Denker965f0b8ba0bd
diff --git a/src/frontend/search.rs b/src/frontend/search.rsindex e9579714..b32d766b 100644--- a/src/frontend/search.rs+++ b/src/frontend/search.rs@@ -22,13 +22,17 @@ use crate::{inverted_index::RetrievedWebpage,searcher::Searcher,webpage::Url,+ Error,};use std::collections::{BTreeMap, HashMap};use std::sync::Arc;use super::{HtmlTemplate, State};use askama::Template;-use axum::{extract, response::{IntoResponse, Response, Redirect}};+use axum::{+ extract,+ response::{IntoResponse, Redirect},+};pub fn html_escape(s: &str) -> String {html_escape::decode_html_entities(s)@@ -237,70 +241,48 @@ struct SearchTemplate {spell_correction: Option<String>,}-struct Res<T> {- template: Option<HtmlTemplate<T>>,- redirect: Option<Redirect>-}--impl<T> IntoResponse for Res<T>-where- T: Template,-{- fn into_response(self) -> Response {- match self.template {- Some(template) => template.into_response(),- None => match self.redirect {- Some(redirect) => redirect.into_response(),- None => Redirect::to("/").into_response()- }- }- }-}-pub async fn route(extract::Query(params): extract::Query<HashMap<String, String>>,Extension(state): Extension<Arc<State>>,) -> impl IntoResponse {- let query = match params.get("q") {- Some(qwe) => qwe,- None => ""- };+ let query = params.get("q").cloned().unwrap_or_default();- if query == "" {- return Res { template: None, redirect: Some(Redirect::to("/")) };+ match state.searcher.search(query.as_str()) {+ Ok(result) => {+ let search_result = result+ .webpages+ .documents+ .into_iter()+ .map(|mut webpage| {+ webpage.primary_image_uuid = webpage.primary_image_uuid.and_then(|uuid| {+ if state.searcher.primary_image(uuid.clone()).is_some() {+ Some(uuid)+ } else {+ None+ }+ });+ webpage+ })+ .map(DisplayedWebpage::from)+ .collect();++ let entity = result+ .entity+ .map(|entity| DisplayedEntity::from(entity, &state.searcher));+ let spell_correction = result.spell_corrected_query;++ let template = SearchTemplate {+ search_result,+ query,+ entity,+ spell_correction,+ };++ HtmlTemplate(template).into_response()+ }+ Err(Error::EmptyQuery) => Redirect::to("/").into_response(),+ Err(_) => panic!("Search failed"), // TODO: show 500 status to user here}-- let result = state.searcher.search(query).expect("Search failed");-- let search_result = result- .webpages- .documents- .into_iter()- .map(|mut webpage| {- webpage.primary_image_uuid = webpage.primary_image_uuid.and_then(|uuid| {- if state.searcher.primary_image(uuid.clone()).is_some() {- Some(uuid)- } else {- None- }- });- webpage- })- .map(DisplayedWebpage::from)- .collect();-- let entity = result- .entity- .map(|entity| DisplayedEntity::from(entity, &state.searcher));- let spell_correction = result.spell_corrected_query;-- let template = SearchTemplate {- search_result,- query: String::from(query),- entity,- spell_correction,- };- Res { template: Some(HtmlTemplate(template)), redirect: None }}fn entity_link_to_html(span: Span, trunace_to: usize) -> String {diff --git a/src/lib.rs b/src/lib.rsindex 787cd41f..22de7fc9 100644--- a/src/lib.rs+++ b/src/lib.rs@@ -189,6 +189,9 @@ pub enum Error {#[error("Parser error")]Parse,++ #[error("Query cannot be completely empty")]+ EmptyQuery,}impl<L, T, E> From<lalrpop_util::ParseError<L, T, E>> for Error {diff --git a/src/query/mod.rs b/src/query/mod.rsindex 3910ab24..e3511ca7 100644--- a/src/query/mod.rs+++ b/src/query/mod.rs@@ -80,6 +80,10 @@ impl Query {&self.terms}+ pub fn is_empty(&self) -> bool {+ self.terms.is_empty()+ }+fn get_tantivy_analyzer(entry: &tantivy::schema::FieldEntry,tokenizer_manager: &tantivy::tokenizer::TokenizerManager,@@ -269,4 +273,13 @@ mod tests {]);}++ #[test]+ fn empty_query() {+ let schema = Arc::new(create_schema());++ let query = Query::parse("", Arc::clone(&schema)).expect("Failed to parse query");++ assert!(query.is_empty())+ }}diff --git a/src/searcher.rs b/src/searcher.rsindex 8b1d11d3..c61f8d90 100644--- a/src/searcher.rs+++ b/src/searcher.rs@@ -25,7 +25,7 @@ use crate::inverted_index::InvertedIndexSearchResult;use crate::query::Query;use crate::ranking::Ranker;use crate::webpage::Url;-use crate::Result;+use crate::{Error, Result};#[derive(Debug)]pub struct SearchResult {@@ -58,6 +58,11 @@ impl Searcher {pub fn search(&self, query: &str) -> Result<SearchResult> {let raw_query = query.to_string();let query = Query::parse(query, self.index.schema())?;++ if query.is_empty() {+ return Err(Error::EmptyQuery);+ }+let ranker = Ranker::new(query.clone());let webpages = self.index.search(&query, ranker.collector())?;let correction = self.index.spell_correction(query.simple_terms());