sam/metasearch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reorder currency symbols in numbat responses

Browse Source
This commit is contained in:
mat 2024-04-13 01:24:37 -05:00
parent eab0f0c6b0
commit f1190ab15f
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/engines/answer/numbat.rs
View File

@ -105,6 +105,7 @@ fn interpret(query: &str) -> Option<(Statement, Markup)> {
if res_markup.to_string().trim() == query { if res_markup.to_string().trim() == query {
return None; return None;
} }
let res_markup = fix_markup(res_markup);
Some((statements.into_iter().last()?, res_markup)) Some((statements.into_iter().last()?, res_markup))
} }
@ -123,7 +124,7 @@ pub struct NumbatResponse {
fn evaluate(query: &str) -> Option<NumbatResponse> { fn evaluate(query: &str) -> Option<NumbatResponse> {
let (statement, res_markup) = interpret(query)?; let (statement, res_markup) = interpret(query)?;
let statement_markup = statement.pretty_print(); let statement_markup = fix_markup(statement.pretty_print());
let query_html = markup_to_html(statement_markup); let query_html = markup_to_html(statement_markup);
let result_html = markup_to_html(res_markup); let result_html = markup_to_html(res_markup);
@ -133,9 +134,28 @@ fn evaluate(query: &str) -> Option<NumbatResponse> {
}) })
} }
fn fix_markup(markup: Markup) -> Markup {
let mut reordered_markup: Vec<FormattedString> = Vec::new();
const LEFT_SIDE_UNITS: &[&str] = &["$", "€", "£", "¥"];
for s in markup.0 {
let FormattedString(_output_type, format_type, content) = s.clone();
if format_type == FormatType::Unit && LEFT_SIDE_UNITS.contains(&content.as_str()) {
// remove the last markup if it's whitespace
if let Some(FormattedString(_, FormatType::Whitespace, _)) = reordered_markup.last() {
reordered_markup.pop();
}
reordered_markup.insert(reordered_markup.len() - 1, s);
} else {
reordered_markup.push(s);
}
}
Markup(reordered_markup)
}
fn markup_to_html(markup: Markup) -> String { fn markup_to_html(markup: Markup) -> String {
let mut html = String::new(); let mut html = String::new();
for FormattedString(_output_type, format_type, content) in markup.0 { for FormattedString(_, format_type, content) in markup.0 {
let class = match format_type { let class = match format_type {
FormatType::Value => "answer-calc-constant", FormatType::Value => "answer-calc-constant",
FormatType::String => "answer-calc-string", FormatType::String => "answer-calc-string",
@ -170,7 +190,7 @@ pub static NUMBAT_CTX: Lazy<numbat::Context> = Lazy::new(|| {
("tb", "TB"), ("tb", "TB"),
("pb", "PB"), ("pb", "PB"),
] { ] {
let _ = ctx.interpret(&format!("unit {alias} = {canonical}"), CodeSource::Internal); let _ = ctx.interpret(&format!("let {alias} = {canonical}"), CodeSource::Internal);
} }
// lowercase aliases (so for example usd and USD are the same unit) // lowercase aliases (so for example usd and USD are the same unit)
@ -186,7 +206,7 @@ pub static NUMBAT_CTX: Lazy<numbat::Context> = Lazy::new(|| {
// add every lowercase aliases for every unit as long as that alias isn't // add every lowercase aliases for every unit as long as that alias isn't
// already taken // already taken
if !unit_names.contains(&name_lower) { if !unit_names.contains(&name_lower) {
let _ = ctx.interpret(&format!("unit {name_lower} = {name}"), CodeSource::Internal); let _ = ctx.interpret(&format!("let {name_lower} = {name}"), CodeSource::Internal);
} }
} }