mirror of
https://github.com/patarapolw/cjdic2.git
synced 2026-11-09 17:39:35 +00:00
little fixes and for Android ui hotfix
This commit is contained in:
1 parent
ff64c035e6
commit
8c9ad287eb
4 files changed
+38
-11
No files matched your search
@@ -37,11 +37,23 @@ impl YomitanDatabase {
|
||||
) -> Result<Vec<YomitanRow>, CJDicError> {
|
||||
let and_or = if q_term == q_reading { "OR" } else { "AND" };
|
||||
|
||||
let q_term_norm = if q_term.ends_with("*") {
|
||||
normalize_term(&q_term[..q_term.len() - 1]) + "*"
|
||||
} else {
|
||||
normalize_term(q_term)
|
||||
};
|
||||
let mut new_t = String::new();
|
||||
let mut new_seg = String::new();
|
||||
|
||||
for c in q_term.chars() {
|
||||
match c {
|
||||
'*' | '?' | '[' | ']' | '\\' => {
|
||||
new_t.push_str(&normalize_term(&new_seg));
|
||||
new_seg.clear();
|
||||
new_t.push(c)
|
||||
}
|
||||
_ => new_seg.push(c),
|
||||
}
|
||||
}
|
||||
|
||||
new_t.push_str(&normalize_term(&new_seg));
|
||||
|
||||
let q_term_norm = new_t;
|
||||
|
||||
// TODO: consider using = if not GLOB string
|
||||
let sql = format!(
|
||||
|
||||
Reference in new issue
Block a user