GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-25 01:06:35 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix case sensitivity of notetype/template searches

Browse source
This commit is contained in:
Damien Elmes 2020-05-02 14:55:30 +10:00
parent 3339c404b4
commit 8246ba148e
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rslib/src/search/sqlwriter.rs
View file

@ -258,11 +258,12 @@ impl SqlWriter<'_> {
write!(self.sql, "c.ord = {}", n).unwrap(); write!(self.sql, "c.ord = {}", n).unwrap();
} }
TemplateKind::Name(name) => { TemplateKind::Name(name) => {
if let Some(glob) = glob_to_re(name) { if let Some(re) = glob_to_re(name) {
let re = format!("(?i){}", re);
self.sql.push_str( self.sql.push_str(
"(n.mid,c.ord) in (select ntid,ord from templates where name regexp ?)", "(n.mid,c.ord) in (select ntid,ord from templates where name regexp ?)",
); );
self.args.push(glob); self.args.push(re);
} else { } else {
self.sql.push_str( self.sql.push_str(
"(n.mid,c.ord) in (select ntid,ord from templates where name = ?)", "(n.mid,c.ord) in (select ntid,ord from templates where name = ?)",
@ -275,10 +276,11 @@ impl SqlWriter<'_> {
} }
fn write_note_type(&mut self, nt_name: &str) -> Result<()> { fn write_note_type(&mut self, nt_name: &str) -> Result<()> {
if let Some(glob) = glob_to_re(nt_name) { if let Some(re) = glob_to_re(nt_name) {
let re = format!("(?i){}", re);
self.sql self.sql
.push_str("n.mid in (select id from notetypes where name regexp ?)"); .push_str("n.mid in (select id from notetypes where name regexp ?)");
self.args.push(glob); self.args.push(re);
} else { } else {
self.sql self.sql
.push_str("n.mid in (select id from notetypes where name = ?)"); .push_str("n.mid in (select id from notetypes where name = ?)");
@ -597,7 +599,7 @@ mod test {
s(ctx, "note:basic*"), s(ctx, "note:basic*"),
( (
"(n.mid in (select id from notetypes where name regexp ?))".into(), "(n.mid in (select id from notetypes where name regexp ?))".into(),
vec!["basic.*".into()] vec!["(?i)basic.*".into()]
) )
); );